Use edition 2021 (#977)

Robbepop · web-flow · commit c90da116748b · 2021-10-21T19:07:12.000+02:00
* update Rust edition 2018 -&gt; 2021

* fix some doc tests due to Rust edition 2021 upgrade
diff --git a/crates/allocator/Cargo.toml b/crates/allocator/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ink_allocator"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>", "Robin Freyler <robin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"
diff --git a/crates/engine/Cargo.toml b/crates/engine/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ink_engine"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>", "Michael Müller <michi@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"
diff --git a/crates/env/Cargo.toml b/crates/env/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ink_env"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>", "Robin Freyler <robin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"
diff --git a/crates/eth_compatibility/Cargo.toml b/crates/eth_compatibility/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ink_eth_compatibility"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"
diff --git a/crates/lang/Cargo.toml b/crates/lang/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ink_lang"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>", "Robin Freyler <robin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"
diff --git a/crates/lang/codegen/Cargo.toml b/crates/lang/codegen/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ink_lang_codegen"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>", "Robin Freyler <robin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"
diff --git a/crates/lang/ir/Cargo.toml b/crates/lang/ir/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ink_lang_ir"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>", "Robin Freyler <robin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"
diff --git a/crates/lang/macro/Cargo.toml b/crates/lang/macro/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ink_lang_macro"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>", "Robin Freyler <robin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"
diff --git a/crates/metadata/Cargo.toml b/crates/metadata/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ink_metadata"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>", "Robin Freyler <robin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"
diff --git a/crates/prelude/Cargo.toml b/crates/prelude/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ink_prelude"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>", "Robin Freyler <robin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"
diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ink_primitives"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>", "Robin Freyler <robin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"
diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ink_storage"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>", "Robin Freyler <robin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "README.md"
diff --git a/crates/storage/derive/Cargo.toml b/crates/storage/derive/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ink_storage_derive"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>", "Robin Freyler <robin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 license = "Apache-2.0"
 readme = "../README.md"
diff --git a/crates/storage/src/collections/vec/mod.rs b/crates/storage/src/collections/vec/mod.rs
@@ -225,7 +225,6 @@ where
     ///
     /// let s: StorageVec<i32> = [0, 1, 1, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55]
     ///     .into_iter()
-    ///     .copied()
     ///     .collect();
     ///
     /// assert_eq!(s.binary_search(&13),  Ok(9));
@@ -271,7 +270,6 @@ where
     ///
     /// let s: StorageVec<i32> = [0, 1, 1, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55]
     ///     .into_iter()
-    ///     .copied()
     ///     .collect();
     ///
     /// let seek = 13;
@@ -359,7 +357,6 @@ where
     ///     (4, 55),
     /// ]
     /// .into_iter()
-    /// .copied()
     /// .collect();
     ///
     /// assert_eq!(s.binary_search_by_key(&13, |&(a, b)| b),  Ok(9));
diff --git a/examples/contract-terminate/Cargo.toml b/examples/contract-terminate/Cargo.toml
@@ -2,7 +2,7 @@
 name = "contract_terminate"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../crates/primitives", default-features = false }
diff --git a/examples/contract-transfer/Cargo.toml b/examples/contract-transfer/Cargo.toml
@@ -2,7 +2,7 @@
 name = "contract_transfer"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../crates/primitives", default-features = false }
diff --git a/examples/delegator/Cargo.toml b/examples/delegator/Cargo.toml
@@ -2,7 +2,7 @@
 name = "delegator"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../crates/primitives", default-features = false }
diff --git a/examples/delegator/accumulator/Cargo.toml b/examples/delegator/accumulator/Cargo.toml
@@ -2,7 +2,7 @@
 name = "accumulator"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../../crates/primitives", default-features = false }
diff --git a/examples/delegator/adder/Cargo.toml b/examples/delegator/adder/Cargo.toml
@@ -2,7 +2,7 @@
 name = "adder"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../../crates/primitives", default-features = false }
diff --git a/examples/delegator/subber/Cargo.toml b/examples/delegator/subber/Cargo.toml
@@ -2,7 +2,7 @@
 name = "subber"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../../crates/primitives", default-features = false }
diff --git a/examples/dns/Cargo.toml b/examples/dns/Cargo.toml
@@ -2,7 +2,7 @@
 name = "dns"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../crates/primitives", default-features = false }
diff --git a/examples/erc1155/Cargo.toml b/examples/erc1155/Cargo.toml
@@ -2,7 +2,7 @@
 name = "erc1155"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../crates/primitives", default-features = false }
diff --git a/examples/erc20/Cargo.toml b/examples/erc20/Cargo.toml
@@ -2,7 +2,7 @@
 name = "erc20"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../crates/primitives", default-features = false }
diff --git a/examples/erc721/Cargo.toml b/examples/erc721/Cargo.toml
@@ -2,7 +2,7 @@
 name = "erc721"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../crates/primitives", default-features = false }
diff --git a/examples/flipper/Cargo.toml b/examples/flipper/Cargo.toml
@@ -2,7 +2,7 @@
 name = "flipper"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../crates/primitives", default-features = false }
diff --git a/examples/incrementer/Cargo.toml b/examples/incrementer/Cargo.toml
@@ -2,7 +2,7 @@
 name = "incrementer"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../crates/primitives", default-features = false }
diff --git a/examples/multisig/Cargo.toml b/examples/multisig/Cargo.toml
@@ -2,7 +2,7 @@
 name = "multisig"
 version = "3.0.0-rc5"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../crates/primitives", default-features = false }
diff --git a/examples/rand-extension/Cargo.toml b/examples/rand-extension/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rand_extension"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../crates/primitives", default-features = false }
diff --git a/examples/trait-erc20/Cargo.toml b/examples/trait-erc20/Cargo.toml
@@ -2,7 +2,7 @@
 name = "trait_erc20"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../crates/primitives", default-features = false }
diff --git a/examples/trait-flipper/Cargo.toml b/examples/trait-flipper/Cargo.toml
@@ -2,7 +2,7 @@
 name = "trait_flipper"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../crates/primitives", default-features = false }
diff --git a/examples/trait-incrementer/Cargo.toml b/examples/trait-incrementer/Cargo.toml
@@ -2,7 +2,7 @@
 name = "trait-incrementer"
 version = "3.0.0-rc6"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 ink_primitives = { version = "3.0.0-rc6", path = "../../crates/primitives", default-features = false }
