Update Rust to 1.85 and fix some future edition 2024 issues (#170)

## 🎟️ Tracking

## 📔 Objective

Update pinned Rust version to 1.85, including a clippy lint fix for
explicit operator precedence in `totp.rs`.

Edition 2024 has reserved the keyword `gen`, so I've updated the few
places where we use it in preparation for that future migration. Note
that the new major version of `rand` has already renamed the `gen`
method to `random` so that change is only temporary.

## ⏰ Reminders before review

- Contributor guidelines followed
- All formatters and local linters executed and passed
- Written new unit and / or integration tests where applicable
- Protected functional changes with optionality (feature flags)
- Used internationalization (i18n) for all UI strings
- CI builds passed
- Communicated to DevOps any deployment requirements
- Updated any necessary documentation (Confluence, contributing docs) or
informed the documentation
  team

## 🦮 Reviewer guidelines

<!-- Suggested interactions but feel free to use (or not) as you desire!
-->

- 👍 (`:+1:`) or similar for great changes
- 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info
- ❓ (`:question:`) for questions
- 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry
that's not quite a confirmed
  issue and could potentially benefit from discussion
- 🎨 (`:art:`) for suggestions / improvements
- ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or
concerns needing attention
- 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or
indications of technical debt
- ⛏ (`:pick:`) for minor or nitpick changes

Author: dani-garcia

crates/bitwarden-crypto/src/enc_string/asymmetric.rs

@@ -204,8 +204,8 @@ impl schemars::JsonSchema for AsymmetricEncString {
         "AsymmetricEncString".to_string()
     }
 
-    fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-        gen.subschema_for::<String>()
+    fn json_schema(generator: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
+        generator.subschema_for::<String>()
     }
 }
 

crates/bitwarden-crypto/src/enc_string/symmetric.rs

@@ -261,8 +261,8 @@ impl schemars::JsonSchema for EncString {
         "EncString".to_string()
     }
 
-    fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-        gen.subschema_for::<String>()
+    fn json_schema(generator: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
+        generator.subschema_for::<String>()
     }
 }
 

crates/bitwarden-crypto/src/util.rs

@@ -36,7 +36,7 @@ where
     Standard: Distribution<T>,
     T: Zeroize,
 {
-    Zeroizing::new(rand::thread_rng().gen::<T>())
+    Zeroizing::new(rand::thread_rng().r#gen::<T>())
 }
 
 /// Generate a random alphanumeric string of a given length

crates/bitwarden-vault/src/totp.rs

@@ -339,10 +339,10 @@ fn derive_steam_otp(binary: u32, digits: u32) -> String {
 fn derive_binary(hash: Vec<u8>) -> u32 {
     let offset = (hash.last().unwrap_or(&0) & 15) as usize;
 
-    ((hash[offset] & 127) as u32) << 24
-        | (hash[offset + 1] as u32) << 16
-        | (hash[offset + 2] as u32) << 8
-        | hash[offset + 3] as u32
+    (((hash[offset] & 127) as u32) << 24)
+        | ((hash[offset + 1] as u32) << 16)
+        | ((hash[offset + 2] as u32) << 8)
+        | (hash[offset + 3] as u32)
 }
 
 /// This code is migrated from our javascript implementation and is not technically a correct base32

crates/memory-testing/Dockerfile

@@ -1,7 +1,7 @@
 ###############################################
 #                 Build stage                 #
 ###############################################
-FROM rust:1.84 AS build
+FROM rust:1.85 AS build
 
 WORKDIR /app
 

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.84.0"
+channel = "1.85.0"
 components = [ "rustfmt", "clippy" ]
 profile = "minimal"