Skip to content

Commit

Permalink
Auto merge of rust-lang#123236 - klensy:tracing-tree-bump, r=Mark-Sim…
Browse files Browse the repository at this point in the history
…ulacrum

bump tracing-tree to 0.3

Only change in `tracing-tree` is davidbarsky/tracing-tree#76
* dedupes `tracing-log`
* dupes `nu-ansi-term`
  • Loading branch information
bors committed Mar 31, 2024
2 parents 5f358a8 + 71ea506 commit c93b17d
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 20 deletions.
32 changes: 15 additions & 17 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2590,6 +2590,15 @@ dependencies = [
"winapi",
]

[[package]]
name = "nu-ansi-term"
version = "0.49.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68"
dependencies = [
"windows-sys 0.48.0",
]

[[package]]
name = "num-conv"
version = "0.1.0"
Expand Down Expand Up @@ -5778,17 +5787,6 @@ dependencies = [
"tracing-subscriber",
]

[[package]]
name = "tracing-log"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
dependencies = [
"log",
"once_cell",
"tracing-core",
]

[[package]]
name = "tracing-log"
version = "0.2.0"
Expand All @@ -5807,7 +5805,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
dependencies = [
"matchers",
"nu-ansi-term",
"nu-ansi-term 0.46.0",
"once_cell",
"parking_lot",
"regex",
Expand All @@ -5816,18 +5814,18 @@ dependencies = [
"thread_local",
"tracing",
"tracing-core",
"tracing-log 0.2.0",
"tracing-log",
]

[[package]]
name = "tracing-tree"
version = "0.2.5"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ec6adcab41b1391b08a308cc6302b79f8095d1673f6947c2dc65ffb028b0b2d"
checksum = "65139ecd2c3f6484c3b99bc01c77afe21e95473630747c7aca525e78b0666675"
dependencies = [
"nu-ansi-term",
"nu-ansi-term 0.49.0",
"tracing-core",
"tracing-log 0.1.4",
"tracing-log",
"tracing-subscriber",
]

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_log/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2021"
tracing = "0.1.28"
tracing-core = "=0.1.30" # FIXME(Nilstrieb) tracing has a deadlock: https://github.com/tokio-rs/tracing/issues/2635
tracing-subscriber = { version = "0.3.3", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] }
tracing-tree = "0.2.0"
tracing-tree = "0.3.0"
# tidy-alphabetical-end

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_pattern_analysis/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ tracing = "0.1"

[dev-dependencies]
tracing-subscriber = { version = "0.3.3", default-features = false, features = ["fmt", "env-filter", "ansi"] }
tracing-tree = "0.2.0"
tracing-tree = "0.3.0"

[features]
default = ["rustc"]
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ serde = { version = "1.0", features = ["derive"] }
smallvec = "1.8.1"
tempfile = "3"
tracing = "0.1"
tracing-tree = "0.2.0"
tracing-tree = "0.3.0"
threadpool = "1.8.1"

[dependencies.tracing-subscriber]
Expand Down

0 comments on commit c93b17d

Please sign in to comment.