Switch to Rust 2021 (#10170)

* Switch to Rust 2021

* Update trybuild to fix errors

substrate/.maintain/node-template-release/Cargo.toml

@@ -2,7 +2,7 @@
 name = "node-template-release"
 version = "3.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0"
 
 [dependencies]

substrate/Cargo.lock

@@ -10944,9 +10944,9 @@ dependencies = [
 
 [[package]]
 name = "trybuild"
-version = "1.0.43"
+version = "1.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02c413315329fc96167f922b46fd0caa3a43f4697b7a7896b183c7142635832"
+checksum = "150e726dc059e6fbd4fce3288f5bb3cf70128cf63b0dde23b938a3cad810fb23"
 dependencies = [
  "dissimilar",
  "glob",

substrate/bin/node-template/node/Cargo.toml

@@ -4,7 +4,7 @@ version = "3.0.0"
 description = "A fresh FRAME-based Substrate node, ready for hacking."
 authors = ["Substrate DevHub <https://github.com/substrate-developer-hub>"]
 homepage = "https://substrate.io/"
-edition = "2018"
+edition = "2021"
 license = "Unlicense"
 publish = false
 repository = "https://github.com/substrate-developer-hub/substrate-node-template/"

substrate/bin/node-template/runtime/Cargo.toml

@@ -4,7 +4,7 @@ version = "3.0.0"
 description = 'A fresh FRAME-based Substrate runtime, ready for hacking.'
 authors = ["Substrate DevHub <https://github.com/substrate-developer-hub>"]
 homepage = "https://substrate.io/"
-edition = "2018"
+edition = "2021"
 license = "Unlicense"
 publish = false
 repository = "https://github.com/substrate-developer-hub/substrate-node-template/"

substrate/bin/node/bench/Cargo.toml

@@ -3,7 +3,7 @@ name = "node-bench"
 version = "0.9.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate node integration benchmarks."
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

substrate/bin/node/cli/Cargo.toml

@@ -4,7 +4,7 @@ version = "3.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic Substrate node implementation in Rust."
 build = "build.rs"
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 default-run = "substrate"
 homepage = "https://substrate.io"

substrate/bin/node/executor/Cargo.toml

@@ -3,7 +3,7 @@ name = "node-executor"
 version = "3.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate node implementation in Rust."
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/bin/node/inspect/Cargo.toml

@@ -2,7 +2,7 @@
 name = "node-inspect"
 version = "0.9.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/bin/node/primitives/Cargo.toml

@@ -2,7 +2,7 @@
 name = "node-primitives"
 version = "2.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/bin/node/rpc-client/Cargo.toml

@@ -2,7 +2,7 @@
 name = "node-rpc-client"
 version = "2.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/bin/node/rpc/Cargo.toml

@@ -2,7 +2,7 @@
 name = "node-rpc"
 version = "3.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/bin/node/runtime/Cargo.toml

@@ -2,7 +2,7 @@
 name = "node-runtime"
 version = "3.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 build = "build.rs"
 license = "Apache-2.0"
 homepage = "https://substrate.io"

substrate/bin/node/test-runner-example/Cargo.toml

@@ -2,7 +2,7 @@
 name = "test-runner-example"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 publish = false
 
 [dependencies]

substrate/bin/node/testing/Cargo.toml

@@ -3,7 +3,7 @@ name = "node-testing"
 version = "3.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Test utilities for Substrate node."
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/bin/utils/chain-spec-builder/Cargo.toml

@@ -2,7 +2,7 @@
 name = "chain-spec-builder"
 version = "2.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 build = "build.rs"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"

substrate/bin/utils/subkey/Cargo.toml

@@ -2,7 +2,7 @@
 name = "subkey"
 version = "2.0.1"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/allocator/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-allocator"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/api/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-client-api"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/authority-discovery/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 build = "build.rs"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"

substrate/client/basic-authorship/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/beefy/Cargo.toml

@@ -2,7 +2,7 @@
 name = "beefy-gadget"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]

substrate/client/beefy/rpc/Cargo.toml

@@ -2,7 +2,7 @@
 name = "beefy-gadget-rpc"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 
 [dependencies]

substrate/client/block-builder/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-block-builder"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/chain-spec/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-chain-spec"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/chain-spec/derive/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/chain-spec/derive/src/impls.rs

@@ -52,7 +52,7 @@ pub fn extension_derive(ast: &DeriveInput) -> proc_macro::TokenStream {
 					use std::any::{Any, TypeId};
 
 					match TypeId::of::<T>() {
-						#( x if x == TypeId::of::<#field_types>() => Any::downcast_ref(&self.#field_names) ),*,
+						#( x if x == TypeId::of::<#field_types>() => <dyn Any>::downcast_ref(&self.#field_names) ),*,
 						_ => None,
 					}
 				}

substrate/client/cli/Cargo.toml

@@ -3,7 +3,7 @@ name = "sc-cli"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate CLI interface."
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/consensus/aura/Cargo.toml

@@ -3,7 +3,7 @@ name = "sc-consensus-aura"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Aura consensus algorithm for substrate"
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/consensus/babe/Cargo.toml

@@ -3,7 +3,7 @@ name = "sc-consensus-babe"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "BABE consensus algorithm for substrate"
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/consensus/babe/rpc/Cargo.toml

@@ -3,7 +3,7 @@ name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "RPC extensions for the BABE consensus algorithm"
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/consensus/common/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-consensus"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/consensus/epochs/Cargo.toml

@@ -3,7 +3,7 @@ name = "sc-consensus-epochs"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic epochs-based utilities for consensus"
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/consensus/manual-seal/Cargo.toml

@@ -3,7 +3,7 @@ name = "sc-consensus-manual-seal"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Manual sealing engine for Substrate"
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/consensus/pow/Cargo.toml

@@ -3,7 +3,7 @@ name = "sc-consensus-pow"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "PoW consensus algorithm for substrate"
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/consensus/slots/Cargo.toml

@@ -3,7 +3,7 @@ name = "sc-consensus-slots"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic slots-based utilities for consensus"
-edition = "2018"
+edition = "2021"
 build = "build.rs"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"

substrate/client/consensus/uncles/Cargo.toml

@@ -3,7 +3,7 @@ name = "sc-consensus-uncles"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Generic uncle inclusion utilities for consensus"
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/db/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-client-db"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/executor/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-executor"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/executor/common/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-executor-common"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/executor/runtime-test/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-runtime-test"
 version = "2.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 build = "build.rs"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 publish = false

substrate/client/executor/src/wasm_runtime.rs

@@ -356,7 +356,6 @@ fn decode_version(mut version: &[u8]) -> Result<RuntimeVersion, WasmError> {
 
 fn decode_runtime_apis(apis: &[u8]) -> Result<Vec<([u8; 8], u32)>, WasmError> {
 	use sp_api::RUNTIME_API_INFO_SIZE;
-	use std::convert::TryFrom;
 
 	apis.chunks(RUNTIME_API_INFO_SIZE)
 		.map(|chunk| {

substrate/client/executor/wasmi/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/executor/wasmtime/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/finality-grandpa-warp-sync/Cargo.toml

@@ -4,7 +4,7 @@ name = "sc-finality-grandpa-warp-sync"
 version = "0.10.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 

substrate/client/finality-grandpa/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/finality-grandpa/rpc/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "RPC extensions for the GRANDPA finality gadget"
 repository = "https://github.com/paritytech/substrate/"
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 readme = "README.md"
 

substrate/client/finality-grandpa/rpc/src/report.rs

@@ -87,8 +87,6 @@ impl RoundState {
 		round_state: &report::RoundState<AuthorityId>,
 		voters: &HashSet<AuthorityId>,
 	) -> Result<Self, Error> {
-		use std::convert::TryInto;
-
 		let prevotes = &round_state.prevote_ids;
 		let missing_prevotes = voters.difference(&prevotes).cloned().collect();
 
@@ -130,8 +128,6 @@ impl ReportedRoundStates {
 		AuthoritySet: ReportAuthoritySet,
 		VoterState: ReportVoterState,
 	{
-		use std::convert::TryFrom;
-
 		let voter_state = voter_state.get().ok_or(Error::EndpointNotReady)?;
 
 		let (set_id, current_voters) = authority_set.get();

substrate/client/informant/Cargo.toml

@@ -3,7 +3,7 @@ name = "sc-informant"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Substrate informant."
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/keystore/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-keystore"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/light/Cargo.toml

@@ -4,7 +4,7 @@ name = "sc-light"
 version = "4.0.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 documentation = "https://docs.rs/sc-light"

substrate/client/network-gossip/Cargo.toml

@@ -4,7 +4,7 @@ name = "sc-network-gossip"
 version = "0.10.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 documentation = "https://docs.rs/sc-network-gossip"

substrate/client/network/Cargo.toml

@@ -4,7 +4,7 @@ name = "sc-network"
 version = "0.10.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 documentation = "https://docs.rs/sc-network"

substrate/client/network/src/protocol/sync.rs

@@ -2172,7 +2172,6 @@ impl<B: BlockT> ChainSync<B> {
 
 	/// Return some key metrics.
 	pub(crate) fn metrics(&self) -> Metrics {
-		use std::convert::TryInto;
 		Metrics {
 			queued_blocks: self.queue_blocks.len().try_into().unwrap_or(std::u32::MAX),
 			fork_targets: self.fork_targets.len().try_into().unwrap_or(std::u32::MAX),

substrate/client/network/src/protocol/sync/extra_requests.rs

@@ -255,7 +255,6 @@ impl<B: BlockT> ExtraRequests<B> {
 
 	/// Get some key metrics.
 	pub(crate) fn metrics(&self) -> Metrics {
-		use std::convert::TryInto;
 		Metrics {
 			pending_requests: self.pending_requests.len().try_into().unwrap_or(std::u32::MAX),
 			active_requests: self.active_requests.len().try_into().unwrap_or(std::u32::MAX),

substrate/client/network/test/Cargo.toml

@@ -4,7 +4,7 @@ name = "sc-network-test"
 version = "0.8.0"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 publish = false
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/offchain/Cargo.toml

@@ -4,7 +4,7 @@ name = "sc-offchain"
 version = "4.0.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 readme = "README.md"

substrate/client/peerset/Cargo.toml

@@ -5,7 +5,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 name = "sc-peerset"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 repository = "https://github.com/paritytech/substrate/"
 documentation = "https://docs.rs/sc-peerset"
 readme = "README.md"

substrate/client/proposer-metrics/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-proposer-metrics"
 version = "0.9.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/rpc-api/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-rpc-api"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/rpc-servers/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-rpc-server"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/rpc/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-rpc"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/rpc/src/chain/mod.rs

@@ -83,8 +83,6 @@ where
 		match number {
 			None => Ok(Some(self.client().info().best_hash)),
 			Some(num_or_hex) => {
-				use std::convert::TryInto;
-
 				// FIXME <2329>: Database seems to limit the block number to u32 for no reason
 				let block_num: u32 = num_or_hex.try_into().map_err(|_| {
 					Error::Other(format!(

substrate/client/service/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-service"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/service/test/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-service-test"
 version = "2.0.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 publish = false
 homepage = "https://substrate.io"

substrate/client/state-db/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-state-db"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/sync-state-rpc/Cargo.toml

@@ -3,7 +3,7 @@ name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "A RPC handler to create sync states for light clients."
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/telemetry/Cargo.toml

@@ -3,7 +3,7 @@ name = "sc-telemetry"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
 description = "Telemetry utils"
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/tracing/Cargo.toml

@@ -3,7 +3,7 @@ name = "sc-tracing"
 version = "4.0.0-dev"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
 description = "Instrumentation implementation for substrate."

substrate/client/tracing/proc-macro/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/transaction-pool/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/transaction-pool/api/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/client/utils/Cargo.toml

@@ -2,7 +2,7 @@
 name = "sc-utils"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/assets/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-assets"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/atomic-swap/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-atomic-swap"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/aura/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-aura"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/authority-discovery/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/authorship/Cargo.toml

@@ -3,7 +3,7 @@ name = "pallet-authorship"
 version = "4.0.0-dev"
 description = "Block and Uncle Author tracking for the FRAME"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/babe/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-babe"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/bags-list/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-bags-list"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/bags-list/fuzzer/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-bags-list-fuzzer"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/bags-list/remote-tests/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-bags-list-remote-tests"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/balances/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-balances"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/beefy-mmr/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 description = "BEEFY + MMR runtime utilities"
 

substrate/frame/beefy-mmr/primitives/Cargo.toml

@@ -2,7 +2,7 @@
 name = "beefy-merkle-tree"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 description = "A no-std/Substrate compatible library to construct binary merkle tree."
 

substrate/frame/beefy/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-beefy"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]

substrate/frame/benchmarking/Cargo.toml

@@ -2,7 +2,7 @@
 name = "frame-benchmarking"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/bounties/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-bounties"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/collective/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-collective"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/contracts/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-contracts"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/contracts/common/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-contracts-primitives"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/contracts/proc-macro/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-contracts-proc-macro"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/contracts/rpc/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-contracts-rpc"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/contracts/rpc/runtime-api/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-contracts-rpc-runtime-api"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/democracy/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-democracy"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/election-provider-multi-phase/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/election-provider-support/Cargo.toml

@@ -2,7 +2,7 @@
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/elections-phragmen/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/elections/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-elections"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/example-offchain-worker/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-example-offchain-worker"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Unlicense"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"

substrate/frame/example-parallel/Cargo.toml

@@ -2,7 +2,7 @@
 name = "pallet-example-parallel"
 version = "3.0.0-dev"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 license = "Unlicense"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"