Update derive syn parse 0.2.0 (+ docify) (#3920)

derive-syn-parse v0.2.0 came out recently which (finally) adds support for syn 2x. Upgrading to this will remove many of the places where syn 1x was still compiling alongside syn 2x in the polkadot-sdk workspace. This also upgrades `docify` to 0.2.8 which is the version that upgrades derive-syn-pasre to 0.2.0. Additionally, this consolidates the `docify` versions in the repo to all use the latest, and in one case upgrades to the 0.2x syntax where 0.1.x was still being used. --------- Co-authored-by: Liam Aharon <liam.aharon@hotmail.com>
2026-04-28 16:47:57 +00:00 · 2024-04-02 01:53:51 -04:00
parent 52e1037849
commit 9a62de27a9
24 changed files with 63 additions and 78 deletions
@@ -4049,7 +4049,7 @@ dependencies = [
 "cumulus-primitives-core",
 "cumulus-primitives-proof-size-hostfunction",
 "cumulus-test-runtime",
- "docify 0.2.7",
+ "docify",
 "frame-support",
 "frame-system",
 "log",
@@ -4571,6 +4571,17 @@ dependencies = [
 "syn 1.0.109",
 ]

+[[package]]
+name = "derive-syn-parse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.53",
+]
+
 [[package]]
 name = "derive_more"
 version = "0.99.17"
@@ -4718,47 +4729,21 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"

 [[package]]
 name = "docify"
-version = "0.1.16"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1b04e6ef3d21119d3eb7b032bca17f99fe041e9c072f30f32cc0e1a2b1f3c4"
+checksum = "43a2f138ad521dc4a2ced1a4576148a6a610b4c5923933b062a263130a6802ce"
 dependencies = [
- "docify_macros 0.1.16",
-]
-
-[[package]]
-name = "docify"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc4fd38aaa9fb98ac70794c82a00360d1e165a87fbf96a8a91f9dfc602aaee2"
-dependencies = [
- "docify_macros 0.2.7",
+ "docify_macros",
 ]

 [[package]]
 name = "docify_macros"
-version = "0.1.16"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b5610df7f2acf89a1bb5d1a66ae56b1c7fcdcfe3948856fb3ace3f644d70eb7"
+checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad"
 dependencies = [
 "common-path",
- "derive-syn-parse",
- "lazy_static",
- "proc-macro2",
- "quote",
- "regex",
- "syn 2.0.53",
- "termcolor",
- "walkdir",
-]
-
-[[package]]
-name = "docify_macros"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63fa215f3a0d40fb2a221b3aa90d8e1fbb8379785a990cb60d62ac71ebdc6460"
-dependencies = [
- "common-path",
- "derive-syn-parse",
+ "derive-syn-parse 0.2.0",
 "once_cell",
 "proc-macro2",
 "quote",
@@ -5454,7 +5439,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 name = "frame"
 version = "0.0.1-dev"
 dependencies = [
- "docify 0.2.7",
+ "docify",
 "frame-executive",
 "frame-support",
 "frame-system",
@@ -5683,7 +5668,7 @@ dependencies = [
 "array-bytes 6.1.0",
 "assert_matches",
 "bitflags 1.3.2",
- "docify 0.2.7",
+ "docify",
 "environmental",
 "frame-metadata",
 "frame-support-procedural",
@@ -5726,7 +5711,7 @@ version = "23.0.0"
 dependencies = [
 "Inflector",
 "cfg-expr",
- "derive-syn-parse",
+ "derive-syn-parse 0.2.0",
 "expander 2.0.0",
 "frame-support-procedural-tools",
 "itertools 0.10.5",
@@ -5827,7 +5812,7 @@ version = "28.0.0"
 dependencies = [
 "cfg-if",
 "criterion 0.4.0",
- "docify 0.2.7",
+ "docify",
 "frame-support",
 "log",
 "parity-scale-codec",
@@ -7944,7 +7929,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d"
 dependencies = [
 "const-random",
- "derive-syn-parse",
+ "derive-syn-parse 0.1.5",
 "macro_magic_core_macros",
 "proc-macro2",
 "quote",
@@ -9216,7 +9201,7 @@ name = "pallet-bags-list"
 version = "27.0.0"
 dependencies = [
 "aquamarine 0.5.0",
- "docify 0.2.7",
+ "docify",
 "frame-benchmarking",
 "frame-election-provider-support",
 "frame-support",
@@ -9264,7 +9249,7 @@ dependencies = [
 name = "pallet-balances"
 version = "28.0.0"
 dependencies = [
- "docify 0.2.7",
+ "docify",
 "frame-benchmarking",
 "frame-support",
 "frame-system",
@@ -9883,7 +9868,7 @@ dependencies = [
 name = "pallet-example-single-block-migrations"
 version = "0.0.1"
 dependencies = [
- "docify 0.2.7",
+ "docify",
 "frame-executive",
 "frame-support",
 "frame-system",
@@ -9949,7 +9934,7 @@ dependencies = [
 name = "pallet-fast-unstake"
 version = "27.0.0"
 dependencies = [
- "docify 0.2.7",
+ "docify",
 "frame-benchmarking",
 "frame-election-provider-support",
 "frame-support",
@@ -10150,7 +10135,7 @@ dependencies = [
 name = "pallet-migrations"
 version = "1.0.0"
 dependencies = [
- "docify 0.1.16",
+ "docify",
 "frame-benchmarking",
 "frame-executive",
 "frame-support",
@@ -10454,7 +10439,7 @@ dependencies = [
 name = "pallet-paged-list"
 version = "0.6.0"
 dependencies = [
- "docify 0.2.7",
+ "docify",
 "frame-benchmarking",
 "frame-support",
 "frame-system",
@@ -10496,7 +10481,7 @@ dependencies = [
 name = "pallet-parameters"
 version = "0.0.1"
 dependencies = [
- "docify 0.2.7",
+ "docify",
 "frame-benchmarking",
 "frame-support",
 "frame-system",
@@ -10657,7 +10642,7 @@ dependencies = [
 name = "pallet-safe-mode"
 version = "9.0.0"
 dependencies = [
- "docify 0.2.7",
+ "docify",
 "frame-benchmarking",
 "frame-support",
 "frame-system",
@@ -10714,7 +10699,7 @@ dependencies = [
 name = "pallet-scheduler"
 version = "29.0.0"
 dependencies = [
- "docify 0.2.7",
+ "docify",
 "frame-benchmarking",
 "frame-support",
 "frame-system",
@@ -10927,7 +10912,7 @@ dependencies = [
 name = "pallet-sudo"
 version = "28.0.0"
 dependencies = [
- "docify 0.2.7",
+ "docify",
 "frame-benchmarking",
 "frame-support",
 "frame-system",
@@ -10957,7 +10942,7 @@ dependencies = [
 name = "pallet-timestamp"
 version = "27.0.0"
 dependencies = [
- "docify 0.2.7",
+ "docify",
 "frame-benchmarking",
 "frame-support",
 "frame-system",
@@ -11061,7 +11046,7 @@ dependencies = [
 name = "pallet-treasury"
 version = "27.0.0"
 dependencies = [
- "docify 0.2.7",
+ "docify",
 "frame-benchmarking",
 "frame-support",
 "frame-system",
@@ -11081,7 +11066,7 @@ dependencies = [
 name = "pallet-tx-pause"
 version = "9.0.0"
 dependencies = [
- "docify 0.2.7",
+ "docify",
 "frame-benchmarking",
 "frame-support",
 "frame-system",
@@ -13370,7 +13355,7 @@ version = "0.0.1"
 dependencies = [
 "cumulus-pallet-aura-ext",
 "cumulus-pallet-parachain-system",
- "docify 0.2.7",
+ "docify",
 "frame",
 "frame-executive",
 "frame-support",
@@ -15632,7 +15617,7 @@ name = "sc-chain-spec"
 version = "27.0.0"
 dependencies = [
 "array-bytes 6.1.0",
- "docify 0.2.7",
+ "docify",
 "log",
 "memmap2 0.9.3",
 "parity-scale-codec",
@@ -18409,7 +18394,7 @@ name = "sp-arithmetic"
 version = "23.0.0"
 dependencies = [
 "criterion 0.4.0",
- "docify 0.2.7",
+ "docify",
 "integer-sqrt",
 "num-traits",
 "parity-scale-codec",
@@ -18959,7 +18944,7 @@ dependencies = [
 name = "sp-runtime"
 version = "31.0.1"
 dependencies = [
- "docify 0.2.7",
+ "docify",
 "either",
 "hash256-std-hasher",
 "impl-trait-for-tuples",
@@ -22,7 +22,7 @@ sp-std = { path = "../../../substrate/primitives/std", default-features = false

 cumulus-primitives-core = { path = "../core", default-features = false }
 cumulus-primitives-proof-size-hostfunction = { path = "../proof-size-hostfunction", default-features = false }
-docify = "0.2.7"
+docify = "0.2.8"

 [dev-dependencies]
 sp-trie = { path = "../../../substrate/primitives/trie", default-features = false }
@@ -27,7 +27,7 @@ pallet-example-offchain-worker = { path = "../../substrate/frame/examples/offcha

 # How we build docs in rust-docs
 simple-mermaid = "0.1.1"
-docify = "0.2.7"
+docify = "0.2.8"

 # Polkadot SDK deps, typically all should only be in scope such that we can link to their doc item.
 node-cli = { package = "staging-node-cli", path = "../../substrate/bin/node/cli" }
@@ -34,7 +34,7 @@ sp-runtime = { path = "../../primitives/runtime" }
 sp-state-machine = { path = "../../primitives/state-machine" }
 log = { workspace = true }
 array-bytes = { version = "6.1" }
-docify = "0.2.7"
+docify = "0.2.8"

 [dev-dependencies]
 substrate-test-runtime = { path = "../../test-utils/runtime" }
@@ -51,7 +51,7 @@ sp-inherents = { default-features = false, path = "../primitives/inherents", opt
 frame-executive = { default-features = false, path = "../frame/executive", optional = true }
 frame-system-rpc-runtime-api = { default-features = false, path = "../frame/system/rpc/runtime-api", optional = true }

-docify = "0.2.7"
+docify = "0.2.8"
 log = { workspace = true }

 [dev-dependencies]
@@ -34,7 +34,7 @@ frame-election-provider-support = { path = "../election-provider-support", defau

 # third party
 log = { workspace = true }
-docify = "0.2.7"
+docify = "0.2.8"
 aquamarine = { version = "0.5.0" }

 # Optional imports for benchmarking
@@ -24,7 +24,7 @@ frame-support = { path = "../support", default-features = false }
 frame-system = { path = "../system", default-features = false }
 sp-runtime = { path = "../../primitives/runtime", default-features = false }
 sp-std = { path = "../../primitives/std", default-features = false }
-docify = "0.2.6"
+docify = "0.2.8"

 [dev-dependencies]
 pallet-transaction-payment = { path = "../transaction-payment" }
@@ -13,7 +13,7 @@ publish = false
 targets = ["x86_64-unknown-linux-gnu"]

 [dependencies]
-docify = { version = "0.2.3", default-features = false }
+docify = "0.2.8"
 log = { version = "0.4.21", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
@@ -30,7 +30,7 @@ frame-election-provider-support = { path = "../election-provider-support", defau

 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }

-docify = "0.2.7"
+docify = "0.2.8"

 [dev-dependencies]
 pallet-staking-reward-curve = { path = "../staking/reward-curve" }
@@ -12,7 +12,7 @@ targets = ["x86_64-unknown-linux-gnu"]

 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-docify = "0.1.14"
+docify = "0.2.8"
 impl-trait-for-tuples = "0.2.2"
 log = "0.4.21"
 scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }
@@ -35,7 +35,7 @@
 //! succeeding after two steps. A runtime upgrade is then enacted and the block number is advanced
 //! until all migrations finish executing. Afterwards, the recorded historic migrations are
 //! checked and events are asserted.
-#![doc = docify::embed!("substrate/frame/migrations/src/tests.rs", simple_works)]
+#![doc = docify::embed!("src/tests.rs", simple_works)]
 //!
 //! ## Pallet API
 //!
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]

 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
-docify = "0.2.7"
+docify = "0.2.8"
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }

 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
@@ -12,7 +12,7 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
 paste = { version = "1.0.14", default-features = false }
 serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
-docify = "0.2.5"
+docify = "0.2.8"

 frame-support = { path = "../support", default-features = false, features = ["experimental"] }
 frame-system = { path = "../system", default-features = false }
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]

 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive"] }
-docify = "0.2.7"
+docify = "0.2.8"
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
 frame-support = { path = "../support", default-features = false }
 frame-system = { path = "../system", default-features = false }
@@ -23,7 +23,7 @@ sp-io = { path = "../../primitives/io", default-features = false }
 sp-runtime = { path = "../../primitives/runtime", default-features = false }
 sp-std = { path = "../../primitives/std", default-features = false }
 sp-weights = { path = "../../primitives/weights", default-features = false }
-docify = "0.2.7"
+docify = "0.2.8"

 [dev-dependencies]
 pallet-preimage = { path = "../preimage" }
@@ -25,7 +25,7 @@ sp-io = { path = "../../primitives/io", default-features = false }
 sp-runtime = { path = "../../primitives/runtime", default-features = false }
 sp-std = { path = "../../primitives/std", default-features = false }

-docify = "0.2.7"
+docify = "0.2.8"

 [dev-dependencies]
 sp-core = { path = "../../primitives/core" }
@@ -58,7 +58,7 @@ k256 = { version = "0.13.1", default-features = false, features = ["ecdsa"] }
 environmental = { version = "1.1.4", default-features = false }
 sp-genesis-builder = { path = "../../primitives/genesis-builder", default-features = false }
 serde_json = { features = ["alloc"], workspace = true }
-docify = "0.2.7"
+docify = "0.2.8"
 static_assertions = "1.1.0"

 aquamarine = { version = "0.5.0" }
@@ -18,7 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 proc-macro = true

 [dependencies]
-derive-syn-parse = "0.1.5"
+derive-syn-parse = "0.2.0"
 Inflector = "0.11.4"
 cfg-expr = "0.15.5"
 itertools = "0.10.3"
@@ -28,7 +28,7 @@ sp-runtime = { path = "../../primitives/runtime", default-features = false, feat
 sp-std = { path = "../../primitives/std", default-features = false }
 sp-version = { path = "../../primitives/version", default-features = false, features = ["serde"] }
 sp-weights = { path = "../../primitives/weights", default-features = false, features = ["serde"] }
-docify = "0.2.7"
+docify = "0.2.8"

 [dev-dependencies]
 criterion = "0.4.0"
@@ -30,7 +30,7 @@ sp-std = { path = "../../primitives/std", default-features = false }
 sp-storage = { path = "../../primitives/storage", default-features = false }
 sp-timestamp = { path = "../../primitives/timestamp", default-features = false }

-docify = "0.2.7"
+docify = "0.2.8"

 [dev-dependencies]
 sp-core = { path = "../../primitives/core" }
@@ -20,7 +20,7 @@ codec = { package = "parity-scale-codec", version = "3.6.1", default-features =
 	"derive",
 	"max-encoded-len",
 ] }
-docify = "0.2.7"
+docify = "0.2.8"
 impl-trait-for-tuples = "0.2.2"
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 serde = { features = ["derive"], optional = true, workspace = true, default-features = true }
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]

 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive"] }
-docify = "0.2.7"
+docify = "0.2.8"
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
 frame-support = { path = "../support", default-features = false }
 frame-system = { path = "../system", default-features = false }
@@ -27,7 +27,7 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
 serde = { features = ["alloc", "derive"], optional = true, workspace = true }
 static_assertions = "1.1.0"
 sp-std = { path = "../std", default-features = false }
-docify = "0.2.7"
+docify = "0.2.8"

 [dev-dependencies]
 criterion = "0.4.0"
@@ -32,7 +32,7 @@ sp-core = { path = "../core", default-features = false }
 sp-io = { path = "../io", default-features = false }
 sp-std = { path = "../std", default-features = false }
 sp-weights = { path = "../weights", default-features = false }
-docify = { version = "0.2.7" }
+docify = "0.2.8"

 simple-mermaid = { version = "0.1.1", optional = true }