Skip to content

Commit 171be8c

Browse files
committed
Downgrade tracing and syn
There's currently a deadlock with tracing when RUSTC_LOG is enabled. Downgrade tracing-core for now to avoid blocking the other updates. syns upgrades cause some nontrivial changes in the diagnostics derive tests, which are best dealt with in another PR.
1 parent 3295cdf commit 171be8c

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

Cargo.lock

+21-21
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ dependencies = [
226226
"proc-macro2",
227227
"quote",
228228
"serde",
229-
"syn 2.0.22",
229+
"syn 2.0.8",
230230
]
231231

232232
[[package]]
@@ -450,7 +450,7 @@ checksum = "ff5053a8a42dbff5279a82423946fc56dc1253b76cf211b2b3c14b3aad4e1281"
450450
dependencies = [
451451
"proc-macro2",
452452
"quote",
453-
"syn 2.0.22",
453+
"syn 2.0.8",
454454
"synstructure 0.13.0",
455455
]
456456

@@ -552,7 +552,7 @@ dependencies = [
552552
"heck",
553553
"proc-macro2",
554554
"quote",
555-
"syn 2.0.22",
555+
"syn 2.0.8",
556556
]
557557

558558
[[package]]
@@ -630,7 +630,7 @@ dependencies = [
630630
"quote",
631631
"regex",
632632
"serde",
633-
"syn 2.0.22",
633+
"syn 2.0.8",
634634
"tokio",
635635
]
636636

@@ -881,7 +881,7 @@ version = "0.1.72"
881881
dependencies = [
882882
"itertools",
883883
"quote",
884-
"syn 2.0.22",
884+
"syn 2.0.8",
885885
]
886886

887887
[[package]]
@@ -982,7 +982,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
982982
dependencies = [
983983
"proc-macro2",
984984
"quote",
985-
"syn 2.0.22",
985+
"syn 2.0.8",
986986
]
987987

988988
[[package]]
@@ -1324,7 +1324,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
13241324
dependencies = [
13251325
"proc-macro2",
13261326
"quote",
1327-
"syn 2.0.22",
1327+
"syn 2.0.8",
13281328
]
13291329

13301330
[[package]]
@@ -2479,7 +2479,7 @@ dependencies = [
24792479
"pest_meta",
24802480
"proc-macro2",
24812481
"quote",
2482-
"syn 2.0.22",
2482+
"syn 2.0.8",
24832483
]
24842484

24852485
[[package]]
@@ -3393,7 +3393,7 @@ dependencies = [
33933393
"fluent-syntax",
33943394
"proc-macro2",
33953395
"quote",
3396-
"syn 2.0.22",
3396+
"syn 2.0.8",
33973397
"unic-langid",
33983398
]
33993399

@@ -3662,7 +3662,7 @@ version = "0.1.0"
36623662
dependencies = [
36633663
"proc-macro2",
36643664
"quote",
3665-
"syn 2.0.22",
3665+
"syn 2.0.8",
36663666
"synstructure 0.13.0",
36673667
]
36683668

@@ -4271,7 +4271,7 @@ dependencies = [
42714271
"proc-macro2",
42724272
"quote",
42734273
"serde",
4274-
"syn 2.0.22",
4274+
"syn 2.0.8",
42754275
]
42764276

42774277
[[package]]
@@ -4415,7 +4415,7 @@ checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
44154415
dependencies = [
44164416
"proc-macro2",
44174417
"quote",
4418-
"syn 2.0.22",
4418+
"syn 2.0.8",
44194419
]
44204420

44214421
[[package]]
@@ -4684,9 +4684,9 @@ dependencies = [
46844684

46854685
[[package]]
46864686
name = "syn"
4687-
version = "2.0.22"
4687+
version = "2.0.8"
46884688
source = "registry+https://github.com/rust-lang/crates.io-index"
4689-
checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616"
4689+
checksum = "bcc02725fd69ab9f26eab07fad303e2497fad6fb9eba4f96c4d1687bdf704ad9"
46904690
dependencies = [
46914691
"proc-macro2",
46924692
"quote",
@@ -4713,7 +4713,7 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06"
47134713
dependencies = [
47144714
"proc-macro2",
47154715
"quote",
4716-
"syn 2.0.22",
4716+
"syn 2.0.8",
47174717
"unicode-xid",
47184718
]
47194719

@@ -4849,7 +4849,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
48494849
dependencies = [
48504850
"proc-macro2",
48514851
"quote",
4852-
"syn 2.0.22",
4852+
"syn 2.0.8",
48534853
]
48544854

48554855
[[package]]
@@ -5008,14 +5008,14 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
50085008
dependencies = [
50095009
"proc-macro2",
50105010
"quote",
5011-
"syn 2.0.22",
5011+
"syn 2.0.8",
50125012
]
50135013

50145014
[[package]]
50155015
name = "tracing-core"
5016-
version = "0.1.31"
5016+
version = "0.1.30"
50175017
source = "registry+https://github.com/rust-lang/crates.io-index"
5018-
checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
5018+
checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
50195019
dependencies = [
50205020
"once_cell",
50215021
"valuable",
@@ -5424,7 +5424,7 @@ dependencies = [
54245424
"once_cell",
54255425
"proc-macro2",
54265426
"quote",
5427-
"syn 2.0.22",
5427+
"syn 2.0.8",
54285428
"wasm-bindgen-shared",
54295429
]
54305430

@@ -5446,7 +5446,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
54465446
dependencies = [
54475447
"proc-macro2",
54485448
"quote",
5449-
"syn 2.0.22",
5449+
"syn 2.0.8",
54505450
"wasm-bindgen-backend",
54515451
"wasm-bindgen-shared",
54525452
]

compiler/rustc_log/Cargo.toml

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

1212
[dev-dependencies]
1313
rustc_span = { path = "../rustc_span" }

compiler/rustc_macros/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ proc-macro = true
88

99
[dependencies]
1010
synstructure = "0.13.0"
11-
syn = { version = "2", features = ["full"] }
11+
# FIXME(Nilstrieb): Updating this causes changes in the diagnostics output.
12+
syn = { version = "=2.0.8", features = ["full"] }
1213
proc-macro2 = "1"
1314
quote = "1"

0 commit comments

Comments
 (0)