Rust 1.74

nix/rust.nix

@@ -8,9 +8,7 @@ let
       # override stdenv.targetPlatform here, if neccesary
     };
   toolchainHashes = {
-    "1.72" = "sha256-dxE7lmCFWlq0nl/wKcmYvpP9zqQbBitAQgZ1zx9Ooik=";
-    "nightly-2023-09-01" =
-      "sha256-zek9JAnRaoX8V0U2Y5ssXVe9tvoQ0ERGXfUCUGYdrMA=";
+    "1.74" = "sha256-PjvuouwTsYfNKW5Vi5Ye7y+lL7SsWGBxCtBOOm2z14c=";
     # copy the placeholder line with the correct toolchain name when adding a new toolchain
     # That is,
     # 1. Put the correct version name;
@@ -19,7 +17,7 @@ let
     #    error: hash mismatch in fixed-output derivation '/nix/store/XXXXX'
     #          specified: sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
     #             got:    sha256-Q9UgzzvxLi4x9aWUJTn+/5EXekC98ODRU1TwhUs9RnY=
-    "placeholder" = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+    # "placeholder" = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
   };
   # rust-toolchain.toml -> { rustc, cargo, rust-analyzer, ... }
   rustChannelFromToolchainFileOf = file:

src/lib/crypto/kimchi_bindings/stubs/rust-toolchain.toml

@@ -11,4 +11,4 @@
 # 4. figure out the hashes of the (now obsolete) docker images used in CI rules that are failing, grep for these hashes and replace them with the new hashes
 
 [toolchain]
-channel = "1.72"
+channel = "1.74"

src/lib/crypto/kimchi_bindings/stubs/src/caml/caml_pointer.rs

@@ -1,7 +1,7 @@
 macro_rules! impl_caml_pointer {
     ($name: ident => $typ: ty) => {
         #[derive(std::fmt::Debug, Clone, ::ocaml_gen::CustomType)]
-        pub struct $name(pub ::std::rc::Rc<$typ>);
+        pub struct $name(pub ::std::rc::Rc<std::cell::UnsafeCell<$typ>>);
 
         impl $name {
             extern "C" fn caml_pointer_finalize(v: ocaml::Raw) {
@@ -32,15 +32,17 @@ macro_rules! impl_caml_pointer {
 
         impl $name {
             pub fn create(x: $typ) -> $name {
-                $name(::std::rc::Rc::new(x))
+                $name(::std::rc::Rc::new(std::cell::UnsafeCell::new(x)))
             }
         }
 
         impl ::std::ops::Deref for $name {
             type Target = $typ;
 
             fn deref(&self) -> &Self::Target {
-                &*self.0
+                unsafe {
+                  &*self.0.get()
+                }
             }
         }
 
@@ -49,16 +51,15 @@ macro_rules! impl_caml_pointer {
                 unsafe {
                     // Wholely unsafe, Batman!
                     // We would use [`get_mut_unchecked`] here, but it is nightly-only.
-                    // Instead, we get coerce our constant pointer to a mutable
-                    // pointer, in the knowledge that
+                    // Instead, we use UnsafeCell in the knowledge that
                     // * all of our mutations called from OCaml are blocking, so
-                    // we won't have multiple live mutable references live
+                    // we won't have multiple live mutable references
                     // simultaneously, and
                     // * the underlying pointer is in the correct state to be
                     //   mutable, since we can call [`get_mut_unchecked`] in
                     //   nightly, or can call [`get_mut`] and unwrap if this is
                     //   the only live reference.
-                    &mut *(((&*self.0) as *const Self::Target) as *mut Self::Target)
+                      &mut *self.0.get()
                 }
             }
         }

src/lib/crypto/kimchi_bindings/stubs/src/pasta_fp_plonk_proof.rs

@@ -72,7 +72,7 @@ pub fn caml_pasta_fp_plonk_proof_create(
             .collect()
     };
 
-    let witness: Vec<Vec<_>> = witness.iter().map(|x| (*x.0).clone()).collect();
+    let witness: Vec<Vec<_>> = witness.iter().map(|x| (**x).clone()).collect();
     let witness: [Vec<_>; COLUMNS] = witness
         .try_into()
         .map_err(|_| ocaml::Error::Message("the witness should be a column of 15 vectors"))?;
@@ -140,7 +140,7 @@ pub fn caml_pasta_fp_plonk_proof_create_and_verify(
             .collect()
     };
 
-    let witness: Vec<Vec<_>> = witness.iter().map(|x| (*x.0).clone()).collect();
+    let witness: Vec<Vec<_>> = witness.iter().map(|x| (**x).clone()).collect();
     let witness: [Vec<_>; COLUMNS] = witness
         .try_into()
         .map_err(|_| ocaml::Error::Message("the witness should be a column of 15 vectors"))?;

src/lib/crypto/kimchi_bindings/stubs/src/pasta_fq_plonk_proof.rs

@@ -66,7 +66,7 @@ pub fn caml_pasta_fq_plonk_proof_create(
             .collect()
     };
 
-    let witness: Vec<Vec<_>> = witness.iter().map(|x| (*x.0).clone()).collect();
+    let witness: Vec<Vec<_>> = witness.iter().map(|x| (**x).clone()).collect();
     let witness: [Vec<_>; COLUMNS] = witness
         .try_into()
         .expect("the witness should be a column of 15 vectors");

src/lib/crypto/kimchi_bindings/wasm/rust-toolchain.toml

@@ -3,4 +3,4 @@
 # This should stay in line with the versions in
 # - kimchi_bindings/js/node_js/build.sh
 # - kimchi_bindings/js/web/build.sh
-channel = "nightly-2023-09-01" # roughly matches 1.72
+channel = "1.74"

src/lib/crypto/kimchi_bindings/wasm/src/lib.rs

@@ -1,4 +1,3 @@
-#![feature(get_mut_unchecked)]
 //! The Marlin_plonk_stubs crate exports some functionalities
 //! and structures from the following the Rust crates to OCaml:
 //!