chore: update libs and examples to 2021 edition Rust (#669)

near · May 25, 2022 · c212e7c · c212e7c
1 parent f4c6b61
commit c212e7c
Show file tree

Hide file tree

Showing 40 changed files with 25 additions and 25 deletions.
diff --git a/examples/callback-results/Cargo.toml b/examples/callback-results/Cargo.toml
@@ -2,7 +2,7 @@
 name = "callback-results"
 version = "0.1.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/examples/callback-results/res/callback_results.wasm b/examples/callback-results/res/callback_results.wasm
diff --git a/examples/cross-contract-calls/Cargo.toml b/examples/cross-contract-calls/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cross-contract-wrapper"
 version = "0.1.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [dev-dependencies]
 anyhow = "1.0"

diff --git a/examples/cross-contract-calls/high-level/Cargo.toml b/examples/cross-contract-calls/high-level/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cross-contract-high-level"
 version = "1.1.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/examples/cross-contract-calls/low-level/Cargo.toml b/examples/cross-contract-calls/low-level/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cross-contract-low-level"
 version = "1.1.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/examples/cross-contract-calls/res/cross_contract_high_level.wasm b/examples/cross-contract-calls/res/cross_contract_high_level.wasm
diff --git a/examples/cross-contract-calls/res/cross_contract_low_level.wasm b/examples/cross-contract-calls/res/cross_contract_low_level.wasm
diff --git a/examples/factory-contract/Cargo.toml b/examples/factory-contract/Cargo.toml
@@ -2,7 +2,7 @@
 name = "factory-contract-wrapper"
 version = "0.1.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [dev-dependencies]
 anyhow = "1.0"

diff --git a/examples/factory-contract/high-level/Cargo.toml b/examples/factory-contract/high-level/Cargo.toml
@@ -2,7 +2,7 @@
 name = "factory-contract-high-level"
 version = "1.1.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/examples/factory-contract/low-level/Cargo.toml b/examples/factory-contract/low-level/Cargo.toml
@@ -2,7 +2,7 @@
 name = "factory-contract-low-level"
 version = "1.1.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/examples/factory-contract/res/factory_contract_high_level.wasm b/examples/factory-contract/res/factory_contract_high_level.wasm
diff --git a/examples/factory-contract/res/factory_contract_low_level.wasm b/examples/factory-contract/res/factory_contract_low_level.wasm
diff --git a/examples/fungible-token/Cargo.toml b/examples/fungible-token/Cargo.toml
@@ -2,7 +2,7 @@
 name = "fungible-token-wrapper"
 version = "0.0.2"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [dev-dependencies]
 anyhow = "1.0"

diff --git a/examples/fungible-token/ft/Cargo.toml b/examples/fungible-token/ft/Cargo.toml
@@ -2,7 +2,7 @@
 name = "fungible-token"
 version = "1.1.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/examples/fungible-token/res/defi.wasm b/examples/fungible-token/res/defi.wasm
diff --git a/examples/fungible-token/res/fungible_token.wasm b/examples/fungible-token/res/fungible_token.wasm
diff --git a/examples/fungible-token/test-contract-defi/Cargo.toml b/examples/fungible-token/test-contract-defi/Cargo.toml
@@ -2,7 +2,7 @@
 name = "defi"
 version = "0.0.1"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/examples/lockable-fungible-token/Cargo.toml b/examples/lockable-fungible-token/Cargo.toml
@@ -2,7 +2,7 @@
 name = "lockable-fungible-token"
 version = "0.1.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/examples/lockable-fungible-token/res/lockable_fungible_token.wasm b/examples/lockable-fungible-token/res/lockable_fungible_token.wasm
diff --git a/examples/mission-control/Cargo.toml b/examples/mission-control/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mission-control"
 version = "0.1.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/examples/mission-control/res/mission_control.wasm b/examples/mission-control/res/mission_control.wasm
diff --git a/examples/non-fungible-token/Cargo.toml b/examples/non-fungible-token/Cargo.toml
@@ -2,7 +2,7 @@
 name = "non-fungible-token-wrapper"
 version = "0.0.2"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [dev-dependencies]
 anyhow = "1.0"

diff --git a/examples/non-fungible-token/nft/Cargo.toml b/examples/non-fungible-token/nft/Cargo.toml
@@ -2,7 +2,7 @@
 name = "non-fungible-token"
 version = "1.1.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/examples/non-fungible-token/res/approval_receiver.wasm b/examples/non-fungible-token/res/approval_receiver.wasm
diff --git a/examples/non-fungible-token/res/non_fungible_token.wasm b/examples/non-fungible-token/res/non_fungible_token.wasm
diff --git a/examples/non-fungible-token/res/token_receiver.wasm b/examples/non-fungible-token/res/token_receiver.wasm
diff --git a/examples/non-fungible-token/test-approval-receiver/Cargo.toml b/examples/non-fungible-token/test-approval-receiver/Cargo.toml
@@ -2,7 +2,7 @@
 name = "approval-receiver"
 version = "0.0.1"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/examples/non-fungible-token/test-token-receiver/Cargo.toml b/examples/non-fungible-token/test-token-receiver/Cargo.toml
@@ -2,7 +2,7 @@
 name = "token-receiver"
 version = "0.0.1"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/examples/status-message-collections/Cargo.toml b/examples/status-message-collections/Cargo.toml
@@ -2,7 +2,7 @@
 name = "status-message-collections"
 version = "0.2.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/examples/status-message-collections/res/status_message_collections.wasm b/examples/status-message-collections/res/status_message_collections.wasm
diff --git a/examples/status-message/Cargo.toml b/examples/status-message/Cargo.toml
@@ -2,7 +2,7 @@
 name = "status-message"
 version = "0.1.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/examples/status-message/res/status_message.wasm b/examples/status-message/res/status_message.wasm
diff --git a/examples/test-contract/Cargo.toml b/examples/test-contract/Cargo.toml
@@ -2,7 +2,7 @@
 name = "test-contract"
 version = "0.1.0"
 authors = ["Near Inc <hello@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/examples/test-contract/res/test_contract.wasm b/examples/test-contract/res/test_contract.wasm
diff --git a/examples/versioned/res/versioned.wasm b/examples/versioned/res/versioned.wasm
diff --git a/near-contract-standards/Cargo.toml b/near-contract-standards/Cargo.toml
@@ -2,7 +2,7 @@
 name = "near-contract-standards"
 version = "4.0.0-pre.9"
 authors = ["Near Inc <hello@near.org>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0"
 categories = ["wasm"]
 repository = "https://github.com/near/near-sdk-rs"

diff --git a/near-sdk-macros/Cargo.toml b/near-sdk-macros/Cargo.toml
@@ -2,7 +2,7 @@
 name = "near-sdk-macros"
 version = "4.0.0-pre.9"
 authors = ["Near Inc <max@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 categories = ["wasm"]
 repository = "https://github.com/near/near-sdk-rs"

diff --git a/near-sdk-macros/src/core_impl/code_generator/ext.rs b/near-sdk-macros/src/core_impl/code_generator/ext.rs
@@ -25,7 +25,7 @@ pub(crate) fn generate_ext_structs(
     if let Some(generics) = generic_details {
         // If ext generation is on struct, make ext function associated with struct not module
         ext_code = quote! {
-            impl#generics #ident#generics {
+            impl #generics #ident #generics {
                 #ext_code
             }
         };
@@ -90,7 +90,7 @@ fn generate_ext_function(attr_signature_info: &AttrSigInfo) -> TokenStream2 {
     let Signature { generics, .. } = original_sig;
     quote! {
         #new_non_bindgen_attrs
-        pub fn #ident#generics(self, #pat_type_list) -> near_sdk::Promise {
+        pub fn #ident #generics(self, #pat_type_list) -> near_sdk::Promise {
             let __args = #serialize;
             near_sdk::Promise::new(self.account_id)
             .function_call_weight(

diff --git a/near-sdk/Cargo.toml b/near-sdk/Cargo.toml
@@ -2,7 +2,7 @@
 name = "near-sdk"
 version = "4.0.0-pre.9"
 authors = ["Near Inc <max@nearprotocol.com>"]
-edition = "2018"
+edition = "2021"
 license = "GPL-3.0"
 readme = "README.md"
 categories = ["wasm"]

diff --git a/sys/Cargo.toml b/sys/Cargo.toml
@@ -2,7 +2,7 @@
 name = "near-sys"
 version = "0.2.0"
 authors = ["Near Inc <hello@near.org>"]
-edition = "2018"
+edition = "2021"
 license = "MIT OR Apache-2.0"
 categories = ["wasm"]
 repository = "https://github.com/near/near-sdk-rs"