Skip to content

Commit c93b17d

Browse files
committed
Auto merge of #123236 - klensy:tracing-tree-bump, r=Mark-Simulacrum
bump tracing-tree to 0.3 Only change in `tracing-tree` is davidbarsky/tracing-tree#76 * dedupes `tracing-log` * dupes `nu-ansi-term`
2 parents 5f358a8 + 71ea506 commit c93b17d

File tree

4 files changed

+18
-20
lines changed

4 files changed

+18
-20
lines changed

Diff for: Cargo.lock

+15-17
Original file line numberDiff line numberDiff line change
@@ -2590,6 +2590,15 @@ dependencies = [
25902590
"winapi",
25912591
]
25922592

2593+
[[package]]
2594+
name = "nu-ansi-term"
2595+
version = "0.49.0"
2596+
source = "registry+https://github.com/rust-lang/crates.io-index"
2597+
checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68"
2598+
dependencies = [
2599+
"windows-sys 0.48.0",
2600+
]
2601+
25932602
[[package]]
25942603
name = "num-conv"
25952604
version = "0.1.0"
@@ -5778,17 +5787,6 @@ dependencies = [
57785787
"tracing-subscriber",
57795788
]
57805789

5781-
[[package]]
5782-
name = "tracing-log"
5783-
version = "0.1.4"
5784-
source = "registry+https://github.com/rust-lang/crates.io-index"
5785-
checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
5786-
dependencies = [
5787-
"log",
5788-
"once_cell",
5789-
"tracing-core",
5790-
]
5791-
57925790
[[package]]
57935791
name = "tracing-log"
57945792
version = "0.2.0"
@@ -5807,7 +5805,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
58075805
checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
58085806
dependencies = [
58095807
"matchers",
5810-
"nu-ansi-term",
5808+
"nu-ansi-term 0.46.0",
58115809
"once_cell",
58125810
"parking_lot",
58135811
"regex",
@@ -5816,18 +5814,18 @@ dependencies = [
58165814
"thread_local",
58175815
"tracing",
58185816
"tracing-core",
5819-
"tracing-log 0.2.0",
5817+
"tracing-log",
58205818
]
58215819

58225820
[[package]]
58235821
name = "tracing-tree"
5824-
version = "0.2.5"
5822+
version = "0.3.0"
58255823
source = "registry+https://github.com/rust-lang/crates.io-index"
5826-
checksum = "2ec6adcab41b1391b08a308cc6302b79f8095d1673f6947c2dc65ffb028b0b2d"
5824+
checksum = "65139ecd2c3f6484c3b99bc01c77afe21e95473630747c7aca525e78b0666675"
58275825
dependencies = [
5828-
"nu-ansi-term",
5826+
"nu-ansi-term 0.49.0",
58295827
"tracing-core",
5830-
"tracing-log 0.1.4",
5828+
"tracing-log",
58315829
"tracing-subscriber",
58325830
]
58335831

Diff for: compiler/rustc_log/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
tracing = "0.1.28"
99
tracing-core = "=0.1.30" # FIXME(Nilstrieb) tracing has a deadlock: https://github.com/tokio-rs/tracing/issues/2635
1010
tracing-subscriber = { version = "0.3.3", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] }
11-
tracing-tree = "0.2.0"
11+
tracing-tree = "0.3.0"
1212
# tidy-alphabetical-end
1313

1414
[dev-dependencies]

Diff for: compiler/rustc_pattern_analysis/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ tracing = "0.1"
2424

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

2929
[features]
3030
default = ["rustc"]

Diff for: src/librustdoc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ serde = { version = "1.0", features = ["derive"] }
2020
smallvec = "1.8.1"
2121
tempfile = "3"
2222
tracing = "0.1"
23-
tracing-tree = "0.2.0"
23+
tracing-tree = "0.3.0"
2424
threadpool = "1.8.1"
2525

2626
[dependencies.tracing-subscriber]

0 commit comments

Comments
 (0)