From a306a3e1af8f46f58ac68007124e69a181475bb0 Mon Sep 17 00:00:00 2001 From: Martin Date: Wed, 19 Jan 2022 18:51:40 +0100 Subject: [PATCH] chore: rust edition 2021 and rust toolchain update --- integration-tests/Cargo.toml | 2 +- node/Cargo.toml | 2 +- pallets/asset-registry/Cargo.toml | 2 +- pallets/duster/Cargo.toml | 2 +- pallets/exchange/Cargo.toml | 2 +- pallets/exchange/benchmarking/Cargo.toml | 2 +- pallets/lbp/Cargo.toml | 2 +- pallets/lbp/rpc/Cargo.toml | 2 +- pallets/lbp/rpc/runtime-api/Cargo.toml | 2 +- pallets/nft/Cargo.toml | 2 +- pallets/offchain-duster/Cargo.toml | 2 +- pallets/xyk/Cargo.toml | 2 +- pallets/xyk/rpc/Cargo.toml | 2 +- pallets/xyk/rpc/runtime-api/Cargo.toml | 2 +- primitives/Cargo.toml | 2 +- runtime/basilisk/Cargo.toml | 2 +- runtime/common/Cargo.toml | 2 +- runtime/testing-basilisk/Cargo.toml | 2 +- rust-toolchain | 2 +- rustfmt.toml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index 2ee08f75377..e60bc881ca3 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -2,7 +2,7 @@ name = "runtime-integration-tests" version = "0.2.1" authors = ["GalacticCouncil"] -edition = "2018" +edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" license = "Apache 2.0" repository = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/node/Cargo.toml b/node/Cargo.toml index 10217436d32..671be55b67b 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -3,7 +3,7 @@ name = "basilisk" version = "5.1.2" description = "Basilisk node" authors = ["GalacticCouncil"] -edition = "2018" +edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" license = "Apache 2.0" repository = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/pallets/asset-registry/Cargo.toml b/pallets/asset-registry/Cargo.toml index 1f00bf4b802..b9ead3d4adc 100644 --- a/pallets/asset-registry/Cargo.toml +++ b/pallets/asset-registry/Cargo.toml @@ -3,7 +3,7 @@ name = "pallet-asset-registry" version = "1.1.6" description = "Pallet for asset registry management" authors = ["GalacticCouncil"] -edition = "2018" +edition = "2021" homepage = "https://github.com/galacticcouncil/basilisk-node" license = "Apache 2.0" repository = "https://github.com/galacticcouncil/basilisk-node" diff --git a/pallets/duster/Cargo.toml b/pallets/duster/Cargo.toml index 087f89f014e..98c5b209369 100644 --- a/pallets/duster/Cargo.toml +++ b/pallets/duster/Cargo.toml @@ -3,7 +3,7 @@ name = "pallet-duster" version = "2.2.1" description = "Account duster" authors = ["GalacticCouncil"] -edition = "2018" +edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" license = "Apache 2.0" repository = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/pallets/exchange/Cargo.toml b/pallets/exchange/Cargo.toml index 613962963aa..82dbbf5e426 100644 --- a/pallets/exchange/Cargo.toml +++ b/pallets/exchange/Cargo.toml @@ -3,7 +3,7 @@ name = "pallet-exchange" version = "5.2.5" description = "Exchange Module" authors = ["GalacticCouncil"] -edition = "2018" +edition = "2021" homepage = "https://github.com/galacticcouncil/basilisk-node" license = "Apache 2.0" repository = "https://github.com/galacticcouncil/basilisk-node" diff --git a/pallets/exchange/benchmarking/Cargo.toml b/pallets/exchange/benchmarking/Cargo.toml index cbb2a4bcd53..a5e0a60a91d 100644 --- a/pallets/exchange/benchmarking/Cargo.toml +++ b/pallets/exchange/benchmarking/Cargo.toml @@ -3,7 +3,7 @@ name = "pallet-exchange-benchmarking" version = "3.3.5" description = "Exchange Benchmarking Module" authors = ["GalacticCouncil"] -edition = "2018" +edition = "2021" homepage = "https://github.com/galacticcouncil/basilisk-node" license = "Apache 2.0" repository = "https://github.com/galacticcouncil/basilisk-node" diff --git a/pallets/lbp/Cargo.toml b/pallets/lbp/Cargo.toml index b1b802d0bd0..57e33e1258b 100644 --- a/pallets/lbp/Cargo.toml +++ b/pallets/lbp/Cargo.toml @@ -3,7 +3,7 @@ name = "pallet-lbp" version = "4.2.2" description = "HydraDX Liquidity Bootstrapping Pool Pallet" authors = ["GalacticCouncil"] -edition = "2018" +edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" license = "Apache 2.0" repository = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/pallets/lbp/rpc/Cargo.toml b/pallets/lbp/rpc/Cargo.toml index f55982e9901..05e4d1d649d 100644 --- a/pallets/lbp/rpc/Cargo.toml +++ b/pallets/lbp/rpc/Cargo.toml @@ -2,7 +2,7 @@ name = "pallet-lbp-rpc" version = "1.0.1" authors = ["GalacticCouncil"] -edition = "2018" +edition = "2021" license = "Apache 2.0" repository = "https://github.com/galacticcouncil/basilisk-node" diff --git a/pallets/lbp/rpc/runtime-api/Cargo.toml b/pallets/lbp/rpc/runtime-api/Cargo.toml index 224e8a3d574..b0896b0874c 100644 --- a/pallets/lbp/rpc/runtime-api/Cargo.toml +++ b/pallets/lbp/rpc/runtime-api/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.1" authors = ["GalacticCouncil"] license = "Apache 2.0" repository = "https://github.com/galacticcouncil/basilisk-node" -edition = "2018" +edition = "2021" [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/pallets/nft/Cargo.toml b/pallets/nft/Cargo.toml index 07bf95d1e1e..2eb738672bb 100644 --- a/pallets/nft/Cargo.toml +++ b/pallets/nft/Cargo.toml @@ -3,7 +3,7 @@ name = "pallet-nft" version = "2.1.1" description = "Simple NFT pallet for creating tokens" authors = ["GalacticCoucil"] -edition = "2018" +edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" license = "Apache 2.0" repository = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/pallets/offchain-duster/Cargo.toml b/pallets/offchain-duster/Cargo.toml index e2334cf946a..b62f9d515aa 100644 --- a/pallets/offchain-duster/Cargo.toml +++ b/pallets/offchain-duster/Cargo.toml @@ -3,7 +3,7 @@ name = "pallet-offchain-duster" version = "2.0.1" description = "Account duster offchain worker" authors = ["GalacticCouncil"] -edition = "2018" +edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" license = "Apache 2.0" repository = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/pallets/xyk/Cargo.toml b/pallets/xyk/Cargo.toml index fec4a889662..7b6a4c5bf94 100644 --- a/pallets/xyk/Cargo.toml +++ b/pallets/xyk/Cargo.toml @@ -3,7 +3,7 @@ name = 'pallet-xyk' version = '3.4.1' description = 'XYK automated market maker' authors = ['GalacticCouncil'] -edition = '2018' +edition = '2021' homepage = 'https://github.com/galacticcouncil/basilisk-node' license = 'Apache 2.0' repository = 'https://github.com/galacticcouncil/basilisk-node' diff --git a/pallets/xyk/rpc/Cargo.toml b/pallets/xyk/rpc/Cargo.toml index 04a261c628b..2f485e464a9 100644 --- a/pallets/xyk/rpc/Cargo.toml +++ b/pallets/xyk/rpc/Cargo.toml @@ -2,7 +2,7 @@ name = "pallet-xyk-rpc" version = "1.0.1" authors = ["GalacticCouncil"] -edition = "2018" +edition = "2021" license = "Apache 2.0" repository = "https://github.com/galacticcouncil/basilisk-node" diff --git a/pallets/xyk/rpc/runtime-api/Cargo.toml b/pallets/xyk/rpc/runtime-api/Cargo.toml index 95c98f74ac0..18c29f2434c 100644 --- a/pallets/xyk/rpc/runtime-api/Cargo.toml +++ b/pallets/xyk/rpc/runtime-api/Cargo.toml @@ -4,7 +4,7 @@ version = "3.0.1" authors = ["GalacticCouncil"] license = "Apache 2.0" repository = "https://github.com/galacticcouncil/basilisk-node" -edition = "2018" +edition = "2021" [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 760f110ac64..8f6cabcb6d8 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -2,7 +2,7 @@ name = "primitives" version = "6.1.2" authors = ["GalacticCouncil"] -edition = "2018" +edition = "2021" repository = "https://github.com/galacticcouncil/Basilisk-node" [build-dependencies] diff --git a/runtime/basilisk/Cargo.toml b/runtime/basilisk/Cargo.toml index f8c3b53df09..bcdce951ee6 100644 --- a/runtime/basilisk/Cargo.toml +++ b/runtime/basilisk/Cargo.toml @@ -2,7 +2,7 @@ name = "basilisk-runtime" version = "31.0.0" authors = ["GalacticCouncil"] -edition = "2018" +edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" license = "Apache 2.0" repository = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 97be7b01e08..6c43198445b 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -2,7 +2,7 @@ name = "common-runtime" version = "1.4.1" authors = ["GalacticCouncil"] -edition = "2018" +edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" license = "Apache 2.0" repository = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/runtime/testing-basilisk/Cargo.toml b/runtime/testing-basilisk/Cargo.toml index c1acf5a3fd5..467b7bb2ec9 100644 --- a/runtime/testing-basilisk/Cargo.toml +++ b/runtime/testing-basilisk/Cargo.toml @@ -2,7 +2,7 @@ name = "testing-basilisk-runtime" version = "31.0.0" authors = ["GalacticCouncil"] -edition = "2018" +edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" license = "Apache 2.0" repository = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/rust-toolchain b/rust-toolchain index 328938dfc00..ada461c161c 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2021-11-07" +channel = "nightly-2021-11-30" components = [ "rustfmt", "clippy" ] targets = [ "wasm32-unknown-unknown" ] profile = "minimal" diff --git a/rustfmt.toml b/rustfmt.toml index 4f653cad66d..a6ae10c6e19 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,4 +1,4 @@ -edition = "2018" +edition = "2021" reorder_imports = true hard_tabs = true max_width = 120