Update syn and fix compilation (paritytech#11707)

* Update syn and fix compilation * Bump pin-project
gear-tech · Feb 27, 2023 · 9b1b0e7 · 9b1b0e7
1 parent df56949
commit 9b1b0e7
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/chain-spec/derive/Cargo.toml b/client/chain-spec/derive/Cargo.toml
@@ -18,4 +18,4 @@ proc-macro = true
 proc-macro-crate = "1.1.3"
 proc-macro2 = "1.0.37"
 quote = "1.0.10"
-syn = "1.0.82"
+syn = "1.0.98"
diff --git a/client/tracing/proc-macro/Cargo.toml b/client/tracing/proc-macro/Cargo.toml
@@ -18,4 +18,4 @@ proc-macro = true
 proc-macro-crate = "1.1.3"
 proc-macro2 = "1.0.37"
 quote = { version = "1.0.10", features = ["proc-macro"] }
-syn = { version = "1.0.82", features = ["proc-macro", "full", "extra-traits", "parsing"] }
+syn = { version = "1.0.98", features = ["proc-macro", "full", "extra-traits", "parsing"] }
diff --git a/frame/contracts/proc-macro/Cargo.toml b/frame/contracts/proc-macro/Cargo.toml
@@ -17,7 +17,7 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1"
 quote = "1"
-syn = "1"
+syn = "1.0.98"
 
 [dev-dependencies]
 

diff --git a/frame/election-provider-support/solution-type/Cargo.toml b/frame/election-provider-support/solution-type/Cargo.toml
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true
 
 [dependencies]
-syn = { version = "1.0.82", features = ["full", "visit"] }
+syn = { version = "1.0.98", features = ["full", "visit"] }
 quote = "1.0"
 proc-macro2 = "1.0.37"
 proc-macro-crate = "1.1.3"

diff --git a/frame/staking/reward-curve/Cargo.toml b/frame/staking/reward-curve/Cargo.toml
@@ -18,7 +18,7 @@ proc-macro = true
 proc-macro-crate = "1.1.3"
 proc-macro2 = "1.0.37"
 quote = "1.0.10"
-syn = { version = "1.0.82", features = ["full", "visit"] }
+syn = { version = "1.0.98", features = ["full", "visit"] }
 
 [dev-dependencies]
 sp-runtime = { version = "6.0.0", path = "../../../primitives/runtime" }
diff --git a/frame/support/procedural/Cargo.toml b/frame/support/procedural/Cargo.toml
@@ -18,7 +18,7 @@ proc-macro = true
 Inflector = "0.11.4"
 proc-macro2 = "1.0.37"
 quote = "1.0.10"
-syn = { version = "1.0.82", features = ["full"] }
+syn = { version = "1.0.98", features = ["full"] }
 frame-support-procedural-tools = { version = "4.0.0-dev", path = "./tools" }
 
 [features]

diff --git a/frame/support/procedural/tools/Cargo.toml b/frame/support/procedural/tools/Cargo.toml
@@ -15,5 +15,5 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro-crate = "1.1.3"
 proc-macro2 = "1.0.37"
 quote = "1.0.10"
-syn = { version = "1.0.82", features = ["full", "visit", "extra-traits"] }
+syn = { version = "1.0.98", features = ["full", "visit", "extra-traits"] }
 frame-support-procedural-tools-derive = { version = "3.0.0", path = "./derive" }
diff --git a/frame/support/procedural/tools/derive/Cargo.toml b/frame/support/procedural/tools/derive/Cargo.toml
@@ -17,4 +17,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.37"
 quote = { version = "1.0.10", features = ["proc-macro"] }
-syn = { version = "1.0.82", features = ["proc-macro", "full", "extra-traits", "parsing"] }
+syn = { version = "1.0.98", features = ["proc-macro", "full", "extra-traits", "parsing"] }
diff --git a/frame/support/procedural/tools/src/syn_ext.rs b/frame/support/procedural/tools/src/syn_ext.rs
@@ -47,7 +47,8 @@ macro_rules! groups_impl {
 
 		impl<P: Parse> Parse for $name<P> {
 			fn parse(input: ParseStream) -> Result<Self> {
-				let syn::group::$name { token, content } = syn::group::$parse(input)?;
+				let content;
+				let token = syn::$parse!(content in input);
 				let content = content.parse()?;
 				Ok($name { token, content })
 			}
@@ -71,9 +72,9 @@ macro_rules! groups_impl {
 	};
 }
 
-groups_impl!(Braces, Brace, Brace, parse_braces);
-groups_impl!(Brackets, Bracket, Bracket, parse_brackets);
-groups_impl!(Parens, Paren, Parenthesis, parse_parens);
+groups_impl!(Braces, Brace, Brace, braced);
+groups_impl!(Brackets, Bracket, Bracket, bracketed);
+groups_impl!(Parens, Paren, Parenthesis, parenthesized);
 
 #[derive(Debug)]
 pub struct PunctuatedInner<P, T, V> {

diff --git a/primitives/api/proc-macro/Cargo.toml b/primitives/api/proc-macro/Cargo.toml
@@ -17,7 +17,7 @@ proc-macro = true
 
 [dependencies]
 quote = "1.0.10"
-syn = { version = "1.0.82", features = ["full", "fold", "extra-traits", "visit"] }
+syn = { version = "1.0.98", features = ["full", "fold", "extra-traits", "visit"] }
 proc-macro2 = "1.0.37"
 blake2 = { version = "0.10.2", default-features = false }
 proc-macro-crate = "1.1.3"

diff --git a/primitives/core/hashing/proc-macro/Cargo.toml b/primitives/core/hashing/proc-macro/Cargo.toml
@@ -18,5 +18,5 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1.0.37"
 quote = "1.0.6"
-syn = { version = "1.0.82", features = ["full", "parsing"] }
+syn = { version = "1.0.98", features = ["full", "parsing"] }
 sp-core-hashing = { version = "4.0.0", default-features = false, path = "../" }
diff --git a/primitives/debug-derive/Cargo.toml b/primitives/debug-derive/Cargo.toml
@@ -18,7 +18,7 @@ proc-macro = true
 
 [dependencies]
 quote = "1.0.10"
-syn = "1.0.82"
+syn = "1.0.98"
 proc-macro2 = "1.0"
 
 [features]

diff --git a/primitives/runtime-interface/proc-macro/Cargo.toml b/primitives/runtime-interface/proc-macro/Cargo.toml
@@ -20,4 +20,4 @@ Inflector = "0.11.4"
 proc-macro-crate = "1.1.3"
 proc-macro2 = "1.0.37"
 quote = "1.0.10"
-syn = { version = "1.0.82", features = ["full", "visit", "fold", "extra-traits"] }
+syn = { version = "1.0.98", features = ["full", "visit", "fold", "extra-traits"] }
diff --git a/primitives/version/proc-macro/Cargo.toml b/primitives/version/proc-macro/Cargo.toml
@@ -19,7 +19,7 @@ proc-macro = true
 codec = { package = "parity-scale-codec", version = "3.0.0", features = [ "derive" ] }
 proc-macro2 = "1.0.37"
 quote = "1.0.10"
-syn = { version = "1.0.82", features = ["full", "fold", "extra-traits", "visit"] }
+syn = { version = "1.0.98", features = ["full", "fold", "extra-traits", "visit"] }
 
 [dev-dependencies]
 sp-version = { version = "5.0.0", path = ".." }
diff --git a/test-utils/derive/Cargo.toml b/test-utils/derive/Cargo.toml
@@ -12,7 +12,7 @@ description = "Substrate test utilities macros"
 proc-macro-crate = "1.1.3"
 proc-macro2 = "1.0.37"
 quote = "1.0.10"
-syn = { version = "1.0.82", features = ["full"] }
+syn = { version = "1.0.98", features = ["full"] }
 
 [lib]
 proc-macro = true