Skip to content

Commit 476acbf

Browse files
committed
Auto merge of #82553 - tmiasko:update-tracing, r=Mark-Simulacrum
Update tracing to 0.1.25 * Update tracing from 0.1.18 to 0.1.25 * Update tracing-subscriber from 0.2.13 to 0.2.16 * Update tracing-tree from 0.1.6 to 0.1.8 * Add pin-project-lite to the list of allowed dependencies (it is now a direct dependency of tracing).
2 parents 939b143 + 2abe7c8 commit 476acbf

File tree

4 files changed

+24
-20
lines changed

4 files changed

+24
-20
lines changed

Cargo.lock

+19-16
Original file line numberDiff line numberDiff line change
@@ -533,13 +533,15 @@ dependencies = [
533533

534534
[[package]]
535535
name = "chrono"
536-
version = "0.4.15"
536+
version = "0.4.19"
537537
source = "registry+https://github.com/rust-lang/crates.io-index"
538-
checksum = "942f72db697d8767c22d46a598e01f2d3b475501ea43d0db4f16d90259182d0b"
538+
checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
539539
dependencies = [
540+
"libc",
540541
"num-integer",
541542
"num-traits",
542543
"time",
544+
"winapi 0.3.9",
543545
]
544546

545547
[[package]]
@@ -4844,9 +4846,9 @@ dependencies = [
48444846

48454847
[[package]]
48464848
name = "sharded-slab"
4847-
version = "0.0.9"
4849+
version = "0.1.1"
48484850
source = "registry+https://github.com/rust-lang/crates.io-index"
4849-
checksum = "06d5a3f5166fb5b42a5439f2eee8b9de149e235961e3eb21c5808fc3ea17ff3e"
4851+
checksum = "79c719719ee05df97490f80a45acfc99e5a30ce98a1e4fb67aee422745ae14e3"
48504852
dependencies = [
48514853
"lazy_static",
48524854
]
@@ -5340,20 +5342,21 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
53405342

53415343
[[package]]
53425344
name = "tracing"
5343-
version = "0.1.19"
5345+
version = "0.1.25"
53445346
source = "registry+https://github.com/rust-lang/crates.io-index"
5345-
checksum = "6d79ca061b032d6ce30c660fded31189ca0b9922bf483cd70759f13a2d86786c"
5347+
checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
53465348
dependencies = [
5347-
"cfg-if 0.1.10",
5349+
"cfg-if 1.0.0",
5350+
"pin-project-lite 0.2.4",
53485351
"tracing-attributes",
53495352
"tracing-core",
53505353
]
53515354

53525355
[[package]]
53535356
name = "tracing-attributes"
5354-
version = "0.1.11"
5357+
version = "0.1.13"
53555358
source = "registry+https://github.com/rust-lang/crates.io-index"
5356-
checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada"
5359+
checksum = "a8a9bd1db7706f2373a190b0d067146caa39350c486f3d455b0e33b431f94c07"
53575360
dependencies = [
53585361
"proc-macro2",
53595362
"quote",
@@ -5371,9 +5374,9 @@ dependencies = [
53715374

53725375
[[package]]
53735376
name = "tracing-log"
5374-
version = "0.1.1"
5377+
version = "0.1.2"
53755378
source = "registry+https://github.com/rust-lang/crates.io-index"
5376-
checksum = "5e0f8c7178e13481ff6765bd169b33e8d554c5d2bbede5e32c356194be02b9b9"
5379+
checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3"
53775380
dependencies = [
53785381
"lazy_static",
53795382
"log",
@@ -5392,9 +5395,9 @@ dependencies = [
53925395

53935396
[[package]]
53945397
name = "tracing-subscriber"
5395-
version = "0.2.13"
5398+
version = "0.2.16"
53965399
source = "registry+https://github.com/rust-lang/crates.io-index"
5397-
checksum = "4ef0a5e15477aa303afbfac3a44cba9b6430fdaad52423b1e6c0dbbe28c3eedd"
5400+
checksum = "8ab8966ac3ca27126141f7999361cc97dd6fb4b71da04c02044fa9045d98bb96"
53985401
dependencies = [
53995402
"ansi_term 0.12.1",
54005403
"chrono",
@@ -5415,15 +5418,15 @@ dependencies = [
54155418

54165419
[[package]]
54175420
name = "tracing-tree"
5418-
version = "0.1.6"
5421+
version = "0.1.8"
54195422
source = "registry+https://github.com/rust-lang/crates.io-index"
5420-
checksum = "43aac8afb493b08e1e1904956f7407c1e671b9c83b26a17e1bd83d6a3520e350"
5423+
checksum = "1a60657cfbf397c603257a8230b3f427e6a2a4e5911a59331b9bb4dffff5b608"
54215424
dependencies = [
54225425
"ansi_term 0.12.1",
54235426
"atty",
5424-
"chrono",
54255427
"termcolor",
54265428
"tracing",
5429+
"tracing-log",
54275430
"tracing-subscriber",
54285431
]
54295432

compiler/rustc_driver/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ crate-type = ["dylib"]
1010
[dependencies]
1111
libc = "0.2"
1212
atty = "0.2"
13-
tracing = { version = "0.1.18" }
14-
tracing-subscriber = { version = "0.2.13", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] }
15-
tracing-tree = "0.1.6"
13+
tracing = { version = "0.1.25" }
14+
tracing-subscriber = { version = "0.2.16", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] }
15+
tracing-tree = "0.1.8"
1616
rustc_middle = { path = "../rustc_middle" }
1717
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1818
rustc_target = { path = "../rustc_target" }

src/tools/compiletest/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ diff = "0.1.10"
1010
unified-diff = "0.2.1"
1111
getopts = "0.2"
1212
tracing = "0.1"
13-
tracing-subscriber = { version = "0.2.13", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] }
13+
tracing-subscriber = { version = "0.2", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] }
1414
regex = "1.0"
1515
serde = { version = "1.0", features = ["derive"] }
1616
serde_json = "1.0"

src/tools/tidy/src/deps.rs

+1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
133133
"parking_lot_core",
134134
"pathdiff",
135135
"perf-event-open-sys",
136+
"pin-project-lite",
136137
"pkg-config",
137138
"polonius-engine",
138139
"ppv-lite86",

0 commit comments

Comments
 (0)