Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Globally upgrade to syn 2.x and latest quote and proc_macro2 1x versions #13846

Merged
merged 10 commits into from
Apr 12, 2023
Merged

Globally upgrade to syn 2.x and latest quote and proc_macro2 1x versions #13846

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2586b11
globally upgrade quote to latest 1.0.x (1.0.26)
sam0x17 Apr 6, 2023
e07aef4
globally upgrade syn to final 1.0.x version (1.0.109)
sam0x17 Apr 6, 2023
9036d98
globally upgrade proc-macro2 to 1.0.56
sam0x17 Apr 6, 2023
f614f5c
upgrade to syn v2.0.13 and fix everything except NestedMeta
sam0x17 Apr 7, 2023
b38693c
fix parse nested metadata code in decl_runtime_apis.rs
sam0x17 Apr 8, 2023
5f12c4d
Port more stuff to syn 2.0
bkchr Apr 8, 2023
2f392c4
Make the rest compile
bkchr Apr 9, 2023
0d271ec
Ignore error
bkchr Apr 9, 2023
5747f31
Merge remote-tracking branch 'origin/master' into sam-globally-upgrad…
sam0x17 Apr 12, 2023
445a619
update to syn 2.0.14
sam0x17 Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions client/chain-spec/derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ proc-macro = true

[dependencies]
proc-macro-crate = "1.1.3"
proc-macro2 = "1.0.37"
quote = "1.0.10"
syn = "1.0.98"
proc-macro2 = "1.0.56"
quote = "1.0.26"
syn = "2.0.13"
6 changes: 3 additions & 3 deletions client/tracing/proc-macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ proc-macro = true

[dependencies]
proc-macro-crate = "1.1.3"
proc-macro2 = "1.0.37"
quote = { version = "1.0.10", features = ["proc-macro"] }
syn = { version = "1.0.98", features = ["proc-macro", "full", "extra-traits", "parsing"] }
proc-macro2 = "1.0.56"
quote = { version = "1.0.26", features = ["proc-macro"] }
syn = { version = "2.0.13", features = ["proc-macro", "full", "extra-traits", "parsing"] }
6 changes: 3 additions & 3 deletions frame/contracts/proc-macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
proc-macro = true

[dependencies]
proc-macro2 = "1"
quote = "1"
syn = { version = "1.0.98", features = ["full"] }
proc-macro2 = "1.0.56"
quote = "1.0.26"
syn = { version = "2.0.13", features = ["full"] }

[dev-dependencies]

Expand Down
6 changes: 3 additions & 3 deletions frame/election-provider-support/solution-type/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
proc-macro = true

[dependencies]
syn = { version = "1.0.98", features = ["full", "visit"] }
quote = "1.0"
proc-macro2 = "1.0.37"
syn = { version = "2.0.13", features = ["full", "visit"] }
quote = "1.0.26"
proc-macro2 = "1.0.56"
proc-macro-crate = "1.1.3"

[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions frame/staking/reward-curve/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ proc-macro = true

[dependencies]
proc-macro-crate = "1.1.3"
proc-macro2 = "1.0.37"
quote = "1.0.10"
syn = { version = "1.0.98", features = ["full", "visit"] }
proc-macro2 = "1.0.56"
quote = "1.0.26"
syn = { version = "2.0.13", features = ["full", "visit"] }

[dev-dependencies]
sp-runtime = { version = "7.0.0", path = "../../../primitives/runtime" }
6 changes: 3 additions & 3 deletions frame/support/procedural/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ derive-syn-parse = "0.1.5"
Inflector = "0.11.4"
cfg-expr = "0.10.3"
itertools = "0.10.3"
proc-macro2 = "1.0.37"
quote = "1.0.10"
syn = { version = "1.0.98", features = ["full"] }
proc-macro2 = "1.0.56"
quote = "1.0.26"
syn = { version = "2.0.13", features = ["full"] }
frame-support-procedural-tools = { version = "4.0.0-dev", path = "./tools" }
proc-macro-warning = { version = "0.2.0", default-features = false }

Expand Down
2 changes: 1 addition & 1 deletion frame/support/procedural/src/pallet/parse/helper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ impl MutItemAttrs for syn::ItemMod {
}
}

impl MutItemAttrs for syn::ImplItemMethod {
impl MutItemAttrs for syn::ImplItemFn {
fn mut_item_attrs(&mut self) -> Option<&mut Vec<syn::Attribute>> {
Some(&mut self.attrs)
}
Expand Down
6 changes: 3 additions & 3 deletions frame/support/procedural/tools/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
proc-macro-crate = "1.1.3"
proc-macro2 = "1.0.37"
quote = "1.0.10"
syn = { version = "1.0.98", features = ["full", "visit", "extra-traits"] }
proc-macro2 = "1.0.56"
quote = "1.0.26"
syn = { version = "2.0.13", features = ["full", "visit", "extra-traits"] }
frame-support-procedural-tools-derive = { version = "3.0.0", path = "./derive" }
6 changes: 3 additions & 3 deletions frame/support/procedural/tools/derive/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ targets = ["x86_64-unknown-linux-gnu"]
proc-macro = true

[dependencies]
proc-macro2 = "1.0.37"
quote = { version = "1.0.10", features = ["proc-macro"] }
syn = { version = "1.0.98", features = ["proc-macro", "full", "extra-traits", "parsing"] }
proc-macro2 = "1.0.56"
quote = { version = "1.0.26", features = ["proc-macro"] }
syn = { version = "2.0.13", features = ["proc-macro", "full", "extra-traits", "parsing"] }
6 changes: 3 additions & 3 deletions primitives/api/proc-macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ targets = ["x86_64-unknown-linux-gnu"]
proc-macro = true

[dependencies]
quote = "1.0.10"
syn = { version = "1.0.98", features = ["full", "fold", "extra-traits", "visit"] }
proc-macro2 = "1.0.37"
quote = "1.0.26"
syn = { version = "2.0.13", features = ["full", "fold", "extra-traits", "visit"] }
proc-macro2 = "1.0.56"
blake2 = { version = "0.10.4", default-features = false }
proc-macro-crate = "1.1.3"
expander = "1.0.0"
Expand Down
Loading