Merge pull request #1641 from oasisprotocol/kostko/feature/bump-rust-…

…toolchain-2024-02-14 Bump Rust toolchain to 2024-02-14
oasisprotocol · Feb 14, 2024 · 3a35dc5 · 3a35dc5
2 parents ee15182 + ce8d47c
commit 3a35dc5
Show file tree

Hide file tree

Showing 15 changed files with 1,294 additions and 1,319 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contract-sdk/specs/access/oas173/Cargo.lock b/contract-sdk/specs/access/oas173/Cargo.lock
diff --git a/contract-sdk/specs/token/oas20/Cargo.lock b/contract-sdk/specs/token/oas20/Cargo.lock
diff --git a/docs/runtime/minimal-runtime.md b/docs/runtime/minimal-runtime.md
@@ -28,10 +28,10 @@ to specify a version to use by creating a special file called
 
 Additionally, due to the requirements of some upstream dependencies, you need to
 configure Cargo to always build with specific target CPU platform features
-(namely AES-NI and SSE3) by creating a `.cargo/config` file with the following
-content:
+(namely AES-NI and SSE3) by creating a `.cargo/config.toml` file with the
+following content:
 
-```toml title=".cargo/config"
+```toml title=".cargo/config.toml"
 [build]
 rustflags = ["-C", "target-feature=+aes,+ssse3"]
 rustdocflags = ["-C", "target-feature=+aes,+ssse3"]
@@ -47,7 +47,7 @@ as follows:
 ```
 minimal-runtime
 ├── .cargo
-│   └── config           # Cargo configuration.
+│   └── config.toml      # Cargo configuration.
 ├── Cargo.lock           # Rust dependency tree checksums.
 ├── Cargo.toml           # Rust crate defintion.
 ├── rust-toolchain.toml  # Rust toolchain version configuration.

diff --git a/examples/contract-sdk/c10l-hello-world/rust-toolchain.toml b/examples/contract-sdk/c10l-hello-world/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2023-09-12"
+channel = "nightly-2024-02-14"
 components = [ "rustfmt", "clippy" ]
 targets = [ "x86_64-fortanix-unknown-sgx", "wasm32-unknown-unknown" ]
 profile = "minimal"
diff --git a/examples/contract-sdk/hello-world/rust-toolchain.toml b/examples/contract-sdk/hello-world/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2023-09-12"
+channel = "nightly-2024-02-14"
 components = [ "rustfmt", "clippy" ]
 targets = [ "x86_64-fortanix-unknown-sgx", "wasm32-unknown-unknown" ]
 profile = "minimal"
diff --git a/examples/runtime-sdk/minimal-runtime/rust-toolchain.toml b/examples/runtime-sdk/minimal-runtime/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2023-09-12"
+channel = "nightly-2024-02-14"
 components = [ "rustfmt", "clippy" ]
 targets = [ "x86_64-fortanix-unknown-sgx", "wasm32-unknown-unknown" ]
 profile = "minimal"
diff --git a/runtime-sdk/modules/contracts/src/abi/oasis/test.rs b/runtime-sdk/modules/contracts/src/abi/oasis/test.rs
@@ -440,7 +440,7 @@ fn test_hello_contract_out_of_gas() {
     assert_eq!(result.code(), 12);
     assert_eq!(
         &result.to_string(),
-        "core: out of gas (limit: 1000 wanted: 1017)"
+        "core: out of gas (limit: 1000 wanted: 1029)"
     );
 }
 

diff --git a/runtime-sdk/modules/evm/src/types.rs b/runtime-sdk/modules/evm/src/types.rs
@@ -109,7 +109,7 @@ pub struct Leash {
 // Thanks to Nick for providing the fancy macros below :)
 
 // This `mod` exists solely to place an `#[allow(...)]` around the generated code.
-#[allow(clippy::assign_op_pattern, clippy::incorrect_clone_impl_on_copy_type)]
+#[allow(clippy::assign_op_pattern, clippy::non_canonical_clone_impl)]
 mod eth {
     use std::convert::TryFrom;
 

diff --git a/runtime-sdk/src/modules/accounts/mod.rs b/runtime-sdk/src/modules/accounts/mod.rs
@@ -780,7 +780,7 @@ impl Module {
 
                 total_supplies.insert(denomination, total_supply);
             }
-            for (denomination, total_supply) in computed_total_supply.iter() {
+            if let Some((denomination, total_supply)) = computed_total_supply.iter().next() {
                 panic!("missing expected total supply: {total_supply} {denomination}",);
             }
         });

diff --git a/runtime-sdk/src/state.rs b/runtime-sdk/src/state.rs
@@ -626,7 +626,7 @@ impl State {
 }
 
 thread_local! {
-    static CURRENT: RefCell<Vec<State>> = RefCell::new(Vec::new());
+    static CURRENT: RefCell<Vec<State>> = const { RefCell::new(Vec::new()) };
 }
 
 struct CurrentStateGuard;
@@ -765,7 +765,7 @@ impl CurrentState {
     #[doc(hidden)]
     pub(crate) fn init_local_fallback() {
         thread_local! {
-            static BASE_STATE_INIT: RefCell<bool> = RefCell::new(false);
+            static BASE_STATE_INIT: RefCell<bool> = const { RefCell::new(false) };
         }
 
         BASE_STATE_INIT.with(|initialized| {

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2023-09-12"
+channel = "nightly-2024-02-14"
 components = [ "rustfmt", "clippy" ]
 targets = [ "x86_64-fortanix-unknown-sgx", "wasm32-unknown-unknown" ]
 profile = "minimal"
diff --git a/tests/contracts/bench/Cargo.lock b/tests/contracts/bench/Cargo.lock