Skip to content

Upgrade edition 2021, rust nightly-2021-11-07 #650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zjb0807 merged 5 commits into from
Nov 21, 2021
Merged

Upgrade edition 2021, rust nightly-2021-11-07 #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0890711
upgrade edition 2021, rust nightly-2021-11-08
zjb0807 Nov 10, 2021
1efca49
update bencher
zjb0807 Nov 10, 2021
1ee2c08
remove resolver
zjb0807 Nov 10, 2021
8f2021f
revert resolver in virtual workspace
zjb0807 Nov 10, 2021
e190bea
set rust nightly-2021-11-07
zjb0807 Nov 20, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/master.yml.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions Cargo.dev.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cargo-features = ["resolver"]

[workspace]
members = [
"auction",
Expand All @@ -25,6 +23,7 @@ members = [
"weight-gen",
"weight-meter",
]

resolver = "2"

[profile.dev]
Expand Down
2 changes: 1 addition & 1 deletion auction/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion authority/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion bencher/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <hello@laminar.one>"]
edition = "2018"
edition = "2021"

[dependencies]
paste = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion bencher/src/build_wasm/prerequisites.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 1 addition & 2 deletions bencher/src/build_wasm/wasm_project.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
2 changes: 1 addition & 1 deletion benchmarking/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <hello@laminar.one>"]
edition = "2018"
edition = "2021"

[dependencies]
serde = { version = "1.0.124", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion build-script-utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <admin@parity.io>", "Laminar Developers <hello@laminar.one>"]
edition = "2018"
edition = "2021"

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
Expand Down
2 changes: 1 addition & 1 deletion currencies/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <hello@laminar.one>"]
edition = "2018"
edition = "2021"

[dependencies]
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion gradually-update/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <hello@laminar.one>"]
edition = "2018"
edition = "2021"

[dependencies]
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion nft/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion oracle/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <hello@laminar.one>"]
edition = "2018"
edition = "2021"

[dependencies]
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion oracle/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "orml-oracle-rpc"
version = "0.4.1-dev"
authors = ["Laminar Developers <hello@laminar.one>"]
edition = "2018"
edition = "2021"
license = "Apache-2.0"
description = "RPC module for orml-oracle."

Expand Down
2 changes: 1 addition & 1 deletion oracle/rpc/runtime-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "orml-oracle-rpc-runtime-api"
version = "0.4.1-dev"
authors = ["Laminar Developers <hello@laminar.one>"]
edition = "2018"
edition = "2021"
license = "Apache-2.0"
description = "Runtime API module for orml-oracle-rpc."

Expand Down
2 changes: 1 addition & 1 deletion rewards/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion tokens/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <hello@laminar.one>"]
edition = "2018"
edition = "2021"

[dependencies]
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion traits/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <hello@laminar.one>"]
edition = "2018"
edition = "2021"

[dependencies]
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion unknown-tokens/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion utilities/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <hello@laminar.one>"]
edition = "2018"
edition = "2021"

[dependencies]
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion vesting/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <hello@laminar.one>"]
edition = "2018"
edition = "2021"

[dependencies]
scale-info = { version = "1.0", default-features = false, features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion weight-gen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description = "CLI for generating weight from bencher output"
license = "Apache-2.0"
version = "0.4.1-dev"
authors = ["Laminar Developers <hello@laminar.one>"]
edition = "2018"
edition = "2021"

[dependencies]
serde = { version = "1.0.119", features = ['derive'] }
Expand Down
2 changes: 1 addition & 1 deletion weight-meter/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "orml-weight-meter"
version = "0.4.1-dev"
license = "Apache-2.0"
authors = ["Laminar Developers <hello@laminar.one>"]
edition = "2018"
edition = "2021"

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
Expand Down
2 changes: 1 addition & 1 deletion weight-meter/weight-meter-procedural/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "weight-meter-procedural"
version = "0.1.0"
license = "Apache-2.0"
authors = ["Laminar Developers <hello@laminar.one>"]
edition = "2018"
edition = "2021"

[lib]
proc-macro = true
Expand Down
2 changes: 1 addition & 1 deletion xcm-support/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion xcm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion xtokens/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down