ci: Upgrade Rust toolchain to 1.84 (#83)

The upgrade is required by the dfinity/stable-structures#267
dfinity · Mar 4, 2025 · 6f662ee · 6f662ee
1 parent e10df83
commit 6f662ee
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 on: [pull_request]
 
 env:
-  RUST_VERSION: 1.75.0
+  RUST_VERSION: 1.84.0
 
 jobs:
   build:
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Cache Cargo
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/canbench-bin/tests/tests.rs b/canbench-bin/tests/tests.rs
@@ -279,17 +279,17 @@ fn reports_scopes_in_new_benchmark() {
 
 Benchmark: bench_scope_new (new)
   total:
-    instructions: 3411 (new)
+    instructions: 3165 (new)
     heap_increase: 0 pages (new)
     stable_memory_increase: 0 pages (new)
 
   scope_1 (scope):
-    instructions: 1002 (new)
+    instructions: 913 (new)
     heap_increase: 0 pages (new)
     stable_memory_increase: 0 pages (new)
 
   scope_2 (scope):
-    instructions: 787 (new)
+    instructions: 714 (new)
     heap_increase: 0 pages (new)
     stable_memory_increase: 0 pages (new)
 
@@ -356,17 +356,17 @@ fn reports_scopes_in_existing_benchmark() {
 
 Benchmark: bench_scope_exists
   total:
-    instructions: 3411 (regressed from 0)
+    instructions: 3165 (regressed from 0)
     heap_increase: 0 pages (no change)
     stable_memory_increase: 0 pages (no change)
 
   scope_1 (scope):
-    instructions: 1002 (regressed by 25.25%)
+    instructions: 913 (regressed by 14.12%)
     heap_increase: 0 pages (improved by 100.00%)
     stable_memory_increase: 0 pages (no change)
 
   scope_2 (scope):
-    instructions: 787 (new)
+    instructions: 714 (new)
     heap_increase: 0 pages (new)
     stable_memory_increase: 0 pages (new)
 
@@ -400,7 +400,7 @@ fn benchmark_works_with_init_args() {
 
 Benchmark: state_check
   total:
-    instructions: 804 (no change)
+    instructions: 872 (no change)
     heap_increase: 0 pages (no change)
     stable_memory_increase: 0 pages (no change)
 
@@ -423,7 +423,7 @@ fn benchmark_stable_writes() {
 
 Benchmark: write_stable_memory (new)
   total:
-    instructions: 49.09 K (new)
+    instructions: 49.12 K (new)
     heap_increase: 0 pages (new)
     stable_memory_increase: 1 pages (new)
 

diff --git a/canbench-rs/src/lib.rs b/canbench-rs/src/lib.rs
@@ -409,7 +409,8 @@ use std::cell::RefCell;
 use std::collections::BTreeMap;
 
 thread_local! {
-    static SCOPES: RefCell<BTreeMap<&'static str, Measurement>> = RefCell::new(BTreeMap::new());
+    static SCOPES: RefCell<BTreeMap<&'static str, Measurement>> =
+        const { RefCell::new(BTreeMap::new()) };
 }
 
 /// The results of a benchmark.

diff --git a/examples/btreemap_vs_hashmap/canbench_results.yml b/examples/btreemap_vs_hashmap/canbench_results.yml
@@ -1,28 +1,28 @@
 benches:
   insert_users:
     total:
-      instructions: 2570835903
+      instructions: 2554172078
       heap_increase: 871
       stable_memory_increase: 0
     scopes: {}
   pre_upgrade_bench:
     total:
-      instructions: 743977526
+      instructions: 807868600
       heap_increase: 519
       stable_memory_increase: 184
     scopes:
       serialize_state:
-        instructions: 729045047
+        instructions: 792936247
         heap_increase: 519
         stable_memory_increase: 0
       writing_to_stable_memory:
-        instructions: 14930540
+        instructions: 14930479
         heap_increase: 0
         stable_memory_increase: 184
   remove_users:
     total:
-      instructions: 2072135114
+      instructions: 2109060905
       heap_increase: 0
       stable_memory_increase: 0
     scopes: {}
-version: 0.1.5
+version: 0.1.9
diff --git a/examples/fibonacci/canbench_results.yml b/examples/fibonacci/canbench_results.yml
@@ -1,14 +1,14 @@
 benches:
   fibonacci_20:
     total:
-      instructions: 2224
+      instructions: 2187
       heap_increase: 0
       stable_memory_increase: 0
     scopes: {}
   fibonacci_45:
     total:
-      instructions: 3011
+      instructions: 2925
       heap_increase: 0
       stable_memory_increase: 0
     scopes: {}
-version: 0.1.1
+version: 0.1.9
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.75.0"  # NOTE: remember to update CI as well.
+channel = "1.84.0"  # NOTE: remember to update CI as well.
 targets = ["wasm32-unknown-unknown"]
diff --git a/tests/init_arg/canbench_results.yml b/tests/init_arg/canbench_results.yml
@@ -1,9 +1,8 @@
-# The results in this file are artificial and are designed to trigger
-# certain scenarios.
 benches:
   state_check:
     total:
-      heap_delta: 0
-      instructions: 804
-      stable_memory_delta: 0
-version: 0.1.0
+      instructions: 872
+      heap_increase: 0
+      stable_memory_increase: 0
+    scopes: {}
+version: 0.1.9
diff --git a/tests/init_arg/src/main.rs b/tests/init_arg/src/main.rs
@@ -2,7 +2,7 @@ use canbench_rs::bench;
 use std::cell::RefCell;
 
 thread_local! {
-    static STATE: RefCell<String> = RefCell::new(String::new());
+    static STATE: RefCell<String> = const { RefCell::new(String::new()) };
 }
 // A benchmark that prints the state.
 #[bench]