Merge pull request #1894 from o1-labs/io/rust-1.92.0

Rust 1.92

Author: dannywillems

.github/config/versions.yaml

@@ -10,7 +10,7 @@
 # - website/docs/developers/getting-started.mdx
 
 rust:
-  stable: "1.84"
+  stable: "1.92"
   beta: "beta"
   nightly: "nightly"
 

CHANGELOG.md

@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Remove ocaml-interop dependency, fix
   [#1235](https://github.com/o1-labs/mina-rust/issues/1235)
   ([#1646](https://github.com/o1-labs/mina-rust/pull/1646))
+- *Build** Update Rust to 1.92 [#1894](https://github.com/o1-labs/mina-rust/issues/1894)
 
 ### Removed
 

Makefile

@@ -246,11 +246,17 @@ format-md: ## Format all markdown and MDX files to wrap at 80 characters
 
 .PHONY: lint
 lint: ## Run linter (clippy)
-	cargo clippy --all-targets -- -D warnings --allow clippy::mutable_key_type
+	cargo clippy --all-targets -- -D warnings \
+	  --allow clippy::large_enum_variant \
+	  --allow clippy::result-large-err \
+	  --allow unused
 
 .PHONY: lint-beta
 lint-beta: ## Run linter (clippy) using beta Rust
-	cargo +beta clippy --all-targets -- -D warnings --allow clippy::mutable_key_type
+	cargo +beta clippy --all-targets -- -D warnings \
+	  --allow clippy::large_enum_variant \
+	  --allow clippy::result-large-err \
+	  --allow unused
 
 .PHONY: lint-bash
 lint-bash: ## Check all shell scripts using shellcheck

ledger/src/account/account.rs

@@ -555,9 +555,9 @@ impl VerificationKey {
             max_proofs_verified: {
                 let n: u64 = rng.gen();
 
-                if n % 3 == 0 {
+                if n.is_multiple_of(3) {
                     ProofVerified::N2
-                } else if n % 2 == 0 {
+                } else if n.is_multiple_of(2) {
                     ProofVerified::N1
                 } else {
                     ProofVerified::N0
@@ -568,9 +568,9 @@ impl VerificationKey {
             actual_wrap_domain_size: {
                 let n: u64 = rng.gen();
 
-                if n % 3 == 0 {
+                if n.is_multiple_of(3) {
                     ProofVerified::N2
-                } else if n % 2 == 0 {
+                } else if n.is_multiple_of(2) {
                     ProofVerified::N1
                 } else {
                     ProofVerified::N0
@@ -1648,13 +1648,13 @@ impl Account {
 
         let gen_perm = |rng: &mut ThreadRng| {
             let n: u64 = rng.gen();
-            if n % 5 == 0 {
+            if n.is_multiple_of(5) {
                 AuthRequired::Either
-            } else if n % 4 == 0 {
+            } else if n.is_multiple_of(4) {
                 AuthRequired::Impossible
-            } else if n % 3 == 0 {
+            } else if n.is_multiple_of(3) {
                 AuthRequired::None
-            } else if n % 2 == 0 {
+            } else if n.is_multiple_of(2) {
                 AuthRequired::Proof
             } else {
                 AuthRequired::Signature

ledger/src/account/common.rs

@@ -246,7 +246,9 @@ impl Default for TokenPermissions {
 // <https://github.com/MinaProtocol/mina/blob/develop/src/lib/mina_base/permissions.mli#L10>
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize, strum_macros::Display)]
 #[serde(rename_all = "lowercase")]
+#[derive(Default)]
 pub enum AuthRequired {
+    #[default]
     None,
     Either,
     Proof,
@@ -255,12 +257,6 @@ pub enum AuthRequired {
     Both, // Legacy only
 }
 
-impl Default for AuthRequired {
-    fn default() -> Self {
-        Self::None
-    }
-}
-
 impl From<ControlTag> for AuthRequired {
     /// <https://github.com/MinaProtocol/mina/blob/3753a8593cc1577bcf4da16620daf9946d88e8e5/src/lib/mina_base/permissions.ml#L68>
     fn from(value: ControlTag) -> Self {

ledger/src/address/mod.rs

@@ -1,7 +1,7 @@
 pub mod raw;
 
 const fn compute_nbytes(nbits: usize) -> usize {
-    if nbits % 8 == 0 {
+    if nbits.is_multiple_of(8) {
         nbits / 8
     } else {
         (nbits / 8) + 1

ledger/src/address/raw.rs

@@ -391,7 +391,7 @@ impl<const NBYTES: usize> Address<NBYTES> {
             .for_each(|(index, byte)| {
                 let byte = *byte as u64;
 
-                if index == 0 && self.length % 8 != 0 {
+                if index == 0 && !self.length.is_multiple_of(8) {
                     let nunused = self.length % 8;
                     account_index |= byte >> (8 - nunused);
                     shift += nunused;

ledger/src/lib.rs

@@ -97,6 +97,10 @@
 #![allow(clippy::len_without_is_empty)]
 #![allow(clippy::result_unit_err)]
 // #![forbid(clippy::needless_pass_by_ref_mut)]
+#![allow(
+    clippy::mutable_key_type,
+    reason = "Deep within ValidCommandWithHash (used by TransactionPool) is a MutableFp that should probably be just Fp. Deserialize will not trigger UB. Remove this allow when fixed"
+)]
 
 // Unused, we don't want to print on stdout
 // /// Print logs on stdout with the prefix `[ledger]`

ledger/src/ondisk/database.rs

@@ -256,7 +256,7 @@ impl Database {
     /// # Returns
     ///
     /// * `Result<Self>` - Returns an instance of the database if successful, otherwise
-    ///    returns an error.
+    ///   returns an error.
     ///
     /// # Errors
     ///
@@ -431,7 +431,7 @@ impl Database {
     /// # Returns
     ///
     /// * `Result<Option<Box<[u8]>>>` - Returns an optional values if the key exists;
-    ///    otherwise, None. Returns an error if something goes wrong.
+    ///   otherwise, None. Returns an error if something goes wrong.
     pub fn get(&mut self, key: &[u8]) -> std::io::Result<Option<Value>> {
         // Note: `&mut self` is required for `File::seek`
 
@@ -537,7 +537,7 @@ impl Database {
     /// # Returns
     ///
     /// * `Result<Vec<Option<Box<[u8]>>>>` - Returns a vector of optional values
-    ///    corresponding to each key; if a key is not found, returns None.
+    ///   corresponding to each key; if a key is not found, returns None.
     pub fn get_batch<K>(&mut self, keys: K) -> std::io::Result<Vec<Option<Value>>>
     where
         K: IntoIterator<Item = Key>,

ledger/src/proofs/circuit_blobs.rs

@@ -137,12 +137,9 @@ pub fn fetch_blocking(filename: &impl AsRef<Path>) -> std::io::Result<Vec<u8>> {
     }
 
     fn to_io_err(err: impl std::fmt::Display) -> std::io::Error {
-        std::io::Error::new(
-            std::io::ErrorKind::Other,
-            format!(
-                "failed to find circuit-blobs locally and to fetch the from github! error: {err}"
-            ),
-        )
+        std::io::Error::other(format!(
+            "failed to find circuit-blobs locally and to fetch the from github! error: {err}"
+        ))
     }
 
     let home_base_dir = home_base_dir();