From b3070be001fd9548cba2c1f4d977ea97acd32038 Mon Sep 17 00:00:00 2001 From: Sam Johnson Date: Wed, 12 Apr 2023 16:42:44 -0400 Subject: [PATCH] Companion for #13846 (#7022) * globally upgrade syn to 1.0.109 * globally upgrade quote to 1.0.26 * globally upgrade proc-macro2 to 1.0.56 * globally bump syn to v2.0.13 * update expander to v1.0.0 * temporary commit to prove new version of expander works (new version hasn't been released yet so using git) * use expander 2.0.0 * upgrade to syn 2.0.14 * update lock file --- polkadot/Cargo.lock | 32 +++++++++++++------ polkadot/node/gum/proc-macro/Cargo.toml | 8 ++--- .../node/test/performance-test/Cargo.toml | 2 +- polkadot/xcm/procedural/Cargo.toml | 6 ++-- 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock index 84a28e94b6..7f80fc312d 100644 --- a/polkadot/Cargo.lock +++ b/polkadot/Cargo.lock @@ -370,7 +370,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -2128,7 +2128,6 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 1.0.109", ] [[package]] @@ -2144,6 +2143,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "expander" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f86a749cf851891866c10515ef6c299b5c69661465e9c3bbe7e07a2b77fb0f7" +dependencies = [ + "blake2", + "fs-err", + "proc-macro2", + "quote", + "syn 2.0.14", +] + [[package]] name = "eyre" version = "0.6.5" @@ -2801,7 +2813,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -10516,7 +10528,7 @@ checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -11921,9 +11933,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "fcf316d5356ed6847742d036f8a39c3b8435cac10bd528a4bd461928a6ab34d5" dependencies = [ "proc-macro2", "quote", @@ -12138,7 +12150,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.14", ] [[package]] @@ -12531,11 +12543,11 @@ name = "tracing-gum-proc-macro" version = "0.9.39" dependencies = [ "assert_matches", - "expander 0.0.6", + "expander 2.0.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.14", ] [[package]] @@ -14112,7 +14124,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.14", ] [[package]] diff --git a/polkadot/node/gum/proc-macro/Cargo.toml b/polkadot/node/gum/proc-macro/Cargo.toml index fccd4d2181..36f3c3b7f6 100644 --- a/polkadot/node/gum/proc-macro/Cargo.toml +++ b/polkadot/node/gum/proc-macro/Cargo.toml @@ -12,11 +12,11 @@ targets = ["x86_64-unknown-linux-gnu"] proc-macro = true [dependencies] -syn = { version = "1.0.95", features = ["full", "extra-traits"] } -quote = "1.0.20" -proc-macro2 = "1.0.43" +syn = { version = "2.0.14", features = ["full", "extra-traits"] } +quote = "1.0.26" +proc-macro2 = "1.0.56" proc-macro-crate = "1.1.3" -expander = "0.0.6" +expander = "2.0.0" [dev-dependencies] assert_matches = "1.5.0" diff --git a/polkadot/node/test/performance-test/Cargo.toml b/polkadot/node/test/performance-test/Cargo.toml index b2b2ef8148..c83557f124 100644 --- a/polkadot/node/test/performance-test/Cargo.toml +++ b/polkadot/node/test/performance-test/Cargo.toml @@ -6,7 +6,7 @@ edition.workspace = true [dependencies] thiserror = "1.0.31" -quote = "1.0.20" +quote = "1.0.26" env_logger = "0.9" log = "0.4" diff --git a/polkadot/xcm/procedural/Cargo.toml b/polkadot/xcm/procedural/Cargo.toml index 22ec39077c..b2790d941b 100644 --- a/polkadot/xcm/procedural/Cargo.toml +++ b/polkadot/xcm/procedural/Cargo.toml @@ -8,7 +8,7 @@ version.workspace = true proc-macro = true [dependencies] -proc-macro2 = "1.0.43" -quote = "1.0.20" -syn = "1.0.95" +proc-macro2 = "1.0.56" +quote = "1.0.26" +syn = "2.0.14" Inflector = "0.11.4"