upgrade rust to 1.77.0 nightly - 2024-02-01

.config/nextest.toml

@@ -7,6 +7,8 @@ failure-output = "immediate-final"
 status-level = "slow"
 # Add retires for flaky tests
 retries = { backoff = "exponential", count = 3, delay = "5s" }
+# Limit threads to a "large" gha container max
+test-threads = 22
 
 [profile.ci.junit]
 # Output a JUnit report under `target/nextest/ci/junit.xml`.

.github/workflows/ci.yml

@@ -12,6 +12,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  CARGO_BUILD_JOBS: 22
   RUST_BACKTRACE: 1
   MC_TELEMETRY: 0
   SKIP_SLOW_TESTS: 1

connection/src/sync.rs

@@ -101,6 +101,7 @@ impl<C: Connection> Ord for SyncConnection<C> {
     }
 }
 
+#[allow(clippy::unconditional_recursion)]
 impl<C: Connection> PartialEq for SyncConnection<C> {
     fn eq(&self, other: &Self) -> bool {
         let self_g = self.read();

fog/distribution/src/main.rs

@@ -66,7 +66,7 @@ use tempfile::tempdir;
 
 thread_local! {
     /// global variable storing connections to the consensus network
-    static CONNS: RefCell<Option<Vec<SyncConnection<ThickClient<HardcodedCredentialsProvider>>>>> = RefCell::new(None);
+    static CONNS: RefCell<Option<Vec<SyncConnection<ThickClient<HardcodedCredentialsProvider>>>>> = const { RefCell::new(None) };
 }
 
 fn set_conns(config: &Config, logger: &Logger) {

fog/test_infra/src/db_tests.rs

@@ -252,7 +252,7 @@ pub fn recovery_db_rng_records_decommissioning<DB: RecoveryDb>(
         .unwrap();
 
     // Test that user has rng record event now
-    let test_rows0 = vec![kex_rng_pubkey1];
+    let test_rows0 = [kex_rng_pubkey1];
 
     let (user_events, next_start_from_user_event_id) = db.search_user_events(0).unwrap();
     let rng_records: Vec<RngRecord> = user_events
@@ -292,7 +292,7 @@ pub fn recovery_db_rng_records_decommissioning<DB: RecoveryDb>(
 
     // Check that if starting at next_start_from_user_event_id we only see the
     // second rng
-    let test_rows1 = vec![kex_rng_pubkey2];
+    let test_rows1 = [kex_rng_pubkey2];
 
     let (user_events, _next_start_from_user_event_id) = db
         .search_user_events(next_start_from_user_event_id)

fog/types/src/common.rs

@@ -91,9 +91,7 @@ impl BlockRange {
     ) -> Option<(usize, BlockRange)> {
         let mut ranges = ranges.into_iter();
         let first = ranges.next().cloned();
-        let Some(mut merged_range) = first else {
-            return None;
-        };
+        let mut merged_range = first?;
         let mut index = 0;
 
         for range in ranges {

fog/view/enclave/impl/src/types.rs

@@ -425,7 +425,7 @@ mod shared_data_tests {
         const STORE_COUNT: usize = 4;
         let mut decrypted_query_responses = Vec::with_capacity(STORE_COUNT);
 
-        let missed_block_ranges = vec![
+        let missed_block_ranges = [
             BlockRange::new(0, 1),
             BlockRange::new(10, 12),
             BlockRange::new(33, 100),

mobilecoind-json/src/data_types.rs

@@ -1515,10 +1515,9 @@ mod test {
         outlay.set_value(1234);
 
         let outlay_index_to_tx_out_index = HashMap::from_iter(vec![(0, 0)]);
-        let outlay_confirmation_numbers =
-            vec![mc_transaction_extra::TxOutConfirmationNumber::from(
-                [0u8; 32],
-            )];
+        let outlay_confirmation_numbers = [mc_transaction_extra::TxOutConfirmationNumber::from(
+            [0u8; 32],
+        )];
 
         // Make proto TxProposal
         let mut proto_proposal = api::TxProposal::new();

rust-toolchain

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2023-12-21"
+channel = "nightly-2024-02-01"

util/build/enclave/src/lib.rs

@@ -653,12 +653,14 @@ impl Builder {
 
         let staticlib_target_dir = &self.target_dir;
 
-        // e.g. "mc_foo_enclave_trusted"
-        let staticlib_crate_name = self.staticlib.workspace_members[0]
-            .repr
-            .split_whitespace()
-            .next()
-            .ok_or(Error::TrustedCrateName)?;
+        // The workspace_members IDs have changed to this format:
+        // path+file:///tmp/mobilenode/consensus/enclave/trusted#[email protected]
+        // We want to capture everything after the last '#' and before the '@'
+        let workspace_id = self.staticlib.workspace_members[0].repr.clone();
+        let workspace_id_parts: Vec<&str> = workspace_id.split('#').collect();
+        let workspace_name = workspace_id_parts[1];
+        let workspace_name_parts: Vec<&str> = workspace_name.split('@').collect();
+        let staticlib_crate_name = workspace_name_parts[0];
 
         // "target/name/<profile>/libmc_foo_enclave_trusted.a" -- not xplatform, but
         // neither is our use of SGX, so meh.

util/repr-bytes/src/lib.rs

@@ -396,11 +396,13 @@ macro_rules! derive_core_cmp_from_as_ref {
             }
         }
 
+        #[allow(clippy::unconditional_recursion)]
         impl PartialEq for $mytype {
             fn eq(&self, other: &Self) -> bool {
                 <Self as AsRef<$asref>>::as_ref(self).eq(<Self as AsRef<$asref>>::as_ref(other))
             }
         }
+
         impl Eq for $mytype {}
 
         impl ::core::hash::Hash for $mytype {

util/u64-ratio/src/lib.rs

@@ -52,6 +52,7 @@ impl U64Ratio {
     }
 }
 
+// #[allow(clippy::unconditional_recursion)]
 impl PartialEq for U64Ratio {
     #[inline]
     fn eq(&self, other: &Self) -> bool {
@@ -65,7 +66,7 @@ impl PartialEq for U64Ratio {
         //
         // This matches how fractions are defined in abstract algebra:
         // https://en.wikipedia.org/wiki/Field_of_fractions
-        (self.num * other.denom).eq(&(other.num * self.denom))
+        (self.num * other.denom) == (other.num * self.denom)
     }
 }