diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index b302bbc90..7ccbb5d6b 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -39,7 +39,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2021-06-17 + toolchain: nightly-2021-11-07 components: rustfmt target: wasm32-unknown-unknown default: true diff --git a/.github/workflows/master.yml.disabled b/.github/workflows/master.yml.disabled index 925e4ef1a..9c2687c65 100644 --- a/.github/workflows/master.yml.disabled +++ b/.github/workflows/master.yml.disabled @@ -16,7 +16,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2021-01-07 + toolchain: nightly-2021-11-07 override: true default: true - name: Install cargo-unleash diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 32cb4bc11..d1dd8e300 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,7 +33,7 @@ jobs: uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2021-06-17 + toolchain: nightly-2021-11-07 components: rustfmt target: wasm32-unknown-unknown override: true diff --git a/Cargo.dev.toml b/Cargo.dev.toml index 61f16a5c0..53fd7b3a0 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -1,5 +1,3 @@ -cargo-features = ["resolver"] - [workspace] members = [ "auction", @@ -25,6 +23,7 @@ members = [ "weight-gen", "weight-meter", ] + resolver = "2" [profile.dev] diff --git a/auction/Cargo.toml b/auction/Cargo.toml index 5561c94db..8ea3a8314 100644 --- a/auction/Cargo.toml +++ b/auction/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Acala Developers"] -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } diff --git a/authority/Cargo.toml b/authority/Cargo.toml index e39801fad..09f1b8d0e 100644 --- a/authority/Cargo.toml +++ b/authority/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Acala Developers"] -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } diff --git a/bencher/Cargo.toml b/bencher/Cargo.toml index e1191a8ef..f87b6a84e 100644 --- a/bencher/Cargo.toml +++ b/bencher/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Laminar Developers "] -edition = "2018" +edition = "2021" [dependencies] paste = "1.0" diff --git a/bencher/src/build_wasm/prerequisites.rs b/bencher/src/build_wasm/prerequisites.rs index fc09c4d0a..3074480df 100644 --- a/bencher/src/build_wasm/prerequisites.rs +++ b/bencher/src/build_wasm/prerequisites.rs @@ -199,7 +199,7 @@ fn create_check_toolchain_project(project_dir: &Path) { [package] name = "wasm-test" version = "1.0.0" - edition = "2018" + edition = "2021" build = "build.rs" [lib] diff --git a/bencher/src/build_wasm/wasm_project.rs b/bencher/src/build_wasm/wasm_project.rs index c28d9099a..0468eed10 100644 --- a/bencher/src/build_wasm/wasm_project.rs +++ b/bencher/src/build_wasm/wasm_project.rs @@ -288,8 +288,7 @@ fn create_project_cargo_toml( let mut package = Table::new(); package.insert("name".into(), format!("{}-wasm", crate_name).into()); package.insert("version".into(), "1.0.0".into()); - package.insert("edition".into(), "2018".into()); - package.insert("resolver".into(), "2".into()); + package.insert("edition".into(), "2021".into()); wasm_workspace_toml.insert("package".into(), package.into()); diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml index 1fd139718..b388554bf 100644 --- a/benchmarking/Cargo.toml +++ b/benchmarking/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Laminar Developers "] -edition = "2018" +edition = "2021" [dependencies] serde = { version = "1.0.124", optional = true } diff --git a/build-script-utils/Cargo.toml b/build-script-utils/Cargo.toml index c5d311634..8d4becf31 100644 --- a/build-script-utils/Cargo.toml +++ b/build-script-utils/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Parity Technologies ", "Laminar Developers "] -edition = "2018" +edition = "2021" [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml index 8b144b694..cba6fb779 100644 --- a/currencies/Cargo.toml +++ b/currencies/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Laminar Developers "] -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml index 03c616677..83fe30fc6 100644 --- a/gradually-update/Cargo.toml +++ b/gradually-update/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Laminar Developers "] -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } diff --git a/nft/Cargo.toml b/nft/Cargo.toml index 26be8bea6..d6219036e 100644 --- a/nft/Cargo.toml +++ b/nft/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Acala Developers"] -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml index 5ca9c4ce2..c1cf41434 100644 --- a/oracle/Cargo.toml +++ b/oracle/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Laminar Developers "] -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml index 1a7bd433e..4dc43a5e9 100644 --- a/oracle/rpc/Cargo.toml +++ b/oracle/rpc/Cargo.toml @@ -2,7 +2,7 @@ name = "orml-oracle-rpc" version = "0.4.1-dev" authors = ["Laminar Developers "] -edition = "2018" +edition = "2021" license = "Apache-2.0" description = "RPC module for orml-oracle." diff --git a/oracle/rpc/runtime-api/Cargo.toml b/oracle/rpc/runtime-api/Cargo.toml index b710cd9a4..3c4138635 100644 --- a/oracle/rpc/runtime-api/Cargo.toml +++ b/oracle/rpc/runtime-api/Cargo.toml @@ -2,7 +2,7 @@ name = "orml-oracle-rpc-runtime-api" version = "0.4.1-dev" authors = ["Laminar Developers "] -edition = "2018" +edition = "2021" license = "Apache-2.0" description = "Runtime API module for orml-oracle-rpc." diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml index ff176ab28..03be8562b 100644 --- a/rewards/Cargo.toml +++ b/rewards/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Acala Developers"] -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index cd14c03a1..b97293de5 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Laminar Developers "] -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } diff --git a/traits/Cargo.toml b/traits/Cargo.toml index 915957db6..142af1a3b 100644 --- a/traits/Cargo.toml +++ b/traits/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Laminar Developers "] -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml index 9aa4d0b4d..f3d1a982b 100644 --- a/unknown-tokens/Cargo.toml +++ b/unknown-tokens/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Acala Developers"] -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml index d6c4ab367..5405eed93 100644 --- a/utilities/Cargo.toml +++ b/utilities/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Laminar Developers "] -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml index a45ad4524..14317162b 100644 --- a/vesting/Cargo.toml +++ b/vesting/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Laminar Developers "] -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] } diff --git a/weight-gen/Cargo.toml b/weight-gen/Cargo.toml index f5d4fa5b1..abf2ad4bb 100644 --- a/weight-gen/Cargo.toml +++ b/weight-gen/Cargo.toml @@ -4,7 +4,7 @@ description = "CLI for generating weight from bencher output" license = "Apache-2.0" version = "0.4.1-dev" authors = ["Laminar Developers "] -edition = "2018" +edition = "2021" [dependencies] serde = { version = "1.0.119", features = ['derive'] } diff --git a/weight-meter/Cargo.toml b/weight-meter/Cargo.toml index 096f985f4..2d85ae59f 100644 --- a/weight-meter/Cargo.toml +++ b/weight-meter/Cargo.toml @@ -3,7 +3,7 @@ name = "orml-weight-meter" version = "0.4.1-dev" license = "Apache-2.0" authors = ["Laminar Developers "] -edition = "2018" +edition = "2021" [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/weight-meter/weight-meter-procedural/Cargo.toml b/weight-meter/weight-meter-procedural/Cargo.toml index 7447cb69e..45d5687ec 100644 --- a/weight-meter/weight-meter-procedural/Cargo.toml +++ b/weight-meter/weight-meter-procedural/Cargo.toml @@ -3,7 +3,7 @@ name = "weight-meter-procedural" version = "0.1.0" license = "Apache-2.0" authors = ["Laminar Developers "] -edition = "2018" +edition = "2021" [lib] proc-macro = true diff --git a/xcm-support/Cargo.toml b/xcm-support/Cargo.toml index 4d033e9a4..3cac4bef7 100644 --- a/xcm-support/Cargo.toml +++ b/xcm-support/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Acala Developers"] -edition = "2018" +edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } diff --git a/xcm/Cargo.toml b/xcm/Cargo.toml index 58593004f..bbc0e3525 100644 --- a/xcm/Cargo.toml +++ b/xcm/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Acala Developers"] -edition = "2018" +edition = "2021" [dependencies] codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false } diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml index f93ad8cf6..855cde707 100644 --- a/xtokens/Cargo.toml +++ b/xtokens/Cargo.toml @@ -5,7 +5,7 @@ repository = "https://github.com/open-web3-stack/open-runtime-module-library/tre license = "Apache-2.0" version = "0.4.1-dev" authors = ["Acala Developers"] -edition = "2018" +edition = "2021" [dependencies] scale-info = { version = "1.0", default-features = false, features = ["derive"] }