Bump Rust version to 1.76

Dependencies and rust-analyzer are broken on older rust version. Also bump hashbrown due to ahash's nightly features breaking on older versions
ergoplatform · Apr 26, 2024 · 48496ab · 48496ab
1 parent 8d7e755
commit 48496ab
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -230,7 +230,7 @@ jobs:
 
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly-2023-05-17
+          toolchain: nightly-2024-01-26
           override: true
 
       - name: install deps

diff --git a/bindings/ergo-lib-jni/build.gradle b/bindings/ergo-lib-jni/build.gradle
@@ -52,7 +52,7 @@ android {
 
     useLibrary 'android.test.runner'
 
-    ndkVersion "21.3.6528147"
+    ndkVersion "26.2.11394342"
 
     defaultConfig {
         minSdkVersion buildConfig.minSdkVersion

diff --git a/ergo-rest/src/wasm_timer.rs b/ergo-rest/src/wasm_timer.rs
@@ -21,9 +21,9 @@
 pub use timer::*;
 
 #[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))]
-pub use std::time::{Instant, SystemTime, UNIX_EPOCH};
+pub(crate) use std::time::Instant;
 #[cfg(all(target_arch = "wasm32", target_os = "unknown"))]
-pub use wasm::*;
+use wasm::*;
 
 mod timer;
 #[cfg(all(target_arch = "wasm32", target_os = "unknown"))]

diff --git a/ergo-rest/src/wasm_timer/timer.rs b/ergo-rest/src/wasm_timer/timer.rs
@@ -250,7 +250,6 @@ mod global;
 mod heap;
 
 pub mod ext;
-pub use ext::{TryFutureExt, TryStreamExt};
 
 /// A "timer heap" used to power separately owned instances of `Delay` and
 /// `Interval`.
@@ -287,7 +286,6 @@ pub struct TimerHandle {
 mod delay;
 mod interval;
 pub use self::delay::Delay;
-pub use self::interval::Interval;
 
 struct Inner {
     /// List of updates the `Timer` needs to process

diff --git a/ergotree-interpreter/Cargo.toml b/ergotree-interpreter/Cargo.toml
@@ -37,7 +37,7 @@ proptest = { workspace = true, optional = true }
 ergo_avltree_rust = "0.1.0"
 gf2_192 = { version = "^0.27.1", path = "../gf2_192" }
 miette = { workspace = true }
-hashbrown = "0.14.1"
+hashbrown = "0.14.3"
 
 [features]
 default = ["json"]

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.66
+1.76