Use Rust 1.94

DEPENDENCIES.md

@@ -577,7 +577,6 @@ The following text applies to code linked from these dependencies:
 [thiserror-impl](https://github.com/dtolnay/thiserror),
 [thiserror](https://github.com/dtolnay/thiserror),
 [thread_local](https://github.com/Amanieu/thread_local-rs),
-[toml](https://github.com/alexcrichton/toml-rs),
 [toml](https://github.com/toml-rs/toml),
 [toml_datetime](https://github.com/toml-rs/toml),
 [toml_parser](https://github.com/toml-rs/toml),

components/example/src/error.rs

@@ -14,7 +14,7 @@
 use error_support::{ErrorHandling, GetErrorHandling};
 
 /// reexport helpers for logging.
-pub use error_support::{error, trace};
+pub use error_support::trace;
 
 /// Result type for internal errors.  Since most code uses internal errors, we just call this one
 /// `Result`.

components/logins/src/encryption.rs

@@ -48,6 +48,9 @@
 //  change at runtime and is already present when the LoginsStore is initialized. In this case, it
 //  makes sense to use the provided StaticKeyManager.
 
+// work around not yet having https://github.com/mozilla/uniffi-rs/pull/2963.
+#![allow(const_evaluatable_unchecked)]
+
 use crate::error::*;
 use std::sync::Arc;
 

components/nimbus/Cargo.toml

@@ -48,4 +48,4 @@ uniffi = { version = "0.31", features = ["build"] }
 error-support = { path = "../support/error", features = ["testing"] }
 clap = { version = "4.2", default-features = false, features = ["std", "derive"] }
 tempfile = "3"
-ctor = "0.2.2"
+ctor = "1"

components/nimbus/src/tests/helpers.rs

@@ -37,7 +37,7 @@ use crate::{
     TargetingAttributes,
 };
 
-#[ctor::ctor]
+#[ctor::ctor(unsafe)]
 fn init() {
     error_support::init_for_tests_with_level(error_support::Level::Info);
 }

components/places/src/storage/history_metadata.rs

@@ -134,10 +134,7 @@ impl HistoryMetadata {
         // encountering it.
         // See `apply_metadata_observation` for where we guard against observing invalid view times.
         let total_view_time: i64 = row.get("total_view_time")?;
-        let total_view_time = match i32::try_from(total_view_time) {
-            Ok(tvt) => tvt,
-            Err(_) => i32::MAX,
-        };
+        let total_view_time = i32::try_from(total_view_time).unwrap_or(i32::MAX);
 
         Ok(Self {
             url: row.get("url")?,

components/support/error/tests/macro_arguments.stderr

@@ -60,9 +60,14 @@ error[E0277]: the trait bound `String: GetErrorHandling` is not satisfied
 112 | #[handle_error(String)] // Must implement `std::error::Error`
     | ^^^^^^^^^^^^^^^^^^^^^^^ the trait `GetErrorHandling` is not implemented for `String`
     |
-    = help: the following other types implement trait `GetErrorHandling`:
-              Error
-              Error2
+help: the following other types implement trait `GetErrorHandling`
+   --> macro_arguments.rs:29:2
+    |
+ 29 |  impl GetErrorHandling for Error {
+    |  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `Error`
+...
+ 85 | impl GetErrorHandling for Error2 {
+    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `Error2`
 note: required by a bound in `convert_log_report_error`
    --> $WORKSPACE/components/support/error/src/handling.rs
     |

components/support/rc_crypto/src/agreement.rs

@@ -394,11 +394,10 @@ mod tests {
             .agree_static(&UnparsedPublicKey::new(&ECDH_P256, &invalid_pub_key))
             .is_err());
 
-        let mut invalid_pub_key = [0u8; 65];
+        let invalid_pub_key = [0u8; 65];
         assert!(prv_key
             .agree_static(&UnparsedPublicKey::new(&ECDH_P256, &invalid_pub_key))
             .is_err());
-        invalid_pub_key[0] = 0x04;
 
         let mut invalid_pub_key = URL_SAFE_NO_PAD.decode(PUB_KEY_1_B64).unwrap().to_vec();
         invalid_pub_key = invalid_pub_key[0..64].to_vec();

components/sync15/src/client/request.rs

@@ -601,7 +601,12 @@ mod test {
                 }
             };
 
-            if self.cur_batch.is_none() {
+            if let Some(cur_batch) = &self.cur_batch {
+                assert_eq!(
+                    batch, cur_batch.id,
+                    "We're in a batch but got the wrong batch id"
+                );
+            } else {
                 assert!(
                     batch.is_none() || batch == Some("true".into()),
                     "We shouldn't be in a batch now"
@@ -612,12 +617,6 @@ mod test {
                     records: 0,
                     bytes: 0,
                 });
-            } else {
-                assert_eq!(
-                    batch,
-                    self.cur_batch.as_ref().unwrap().id,
-                    "We're in a batch but got the wrong batch id"
-                );
             }
 
             {

components/viaduct/src/backend.rs

@@ -3,6 +3,9 @@
 *
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+// work around not yet having https://github.com/mozilla/uniffi-rs/pull/2963.
+#![allow(const_evaluatable_unchecked)]
+
 use std::sync::{Arc, OnceLock};
 
 use crate::{ClientSettings, Request, Response, Result, ViaductError};

megazords/full/DEPENDENCIES.md

@@ -541,7 +541,6 @@ The following text applies to code linked from these dependencies:
 [thiserror-impl](https://github.com/dtolnay/thiserror),
 [thiserror](https://github.com/dtolnay/thiserror),
 [thread_local](https://github.com/Amanieu/thread_local-rs),
-[toml](https://github.com/alexcrichton/toml-rs),
 [toml](https://github.com/toml-rs/toml),
 [toml_datetime](https://github.com/toml-rs/toml),
 [toml_parser](https://github.com/toml-rs/toml),

megazords/full/android/dependency-licenses.xml

@@ -484,10 +484,6 @@ the details of which are reproduced below.
     <name>Apache License 2.0: thread_local</name>
     <url>https://github.com/Amanieu/thread_local-rs/blob/master/LICENSE-APACHE</url>
   </license>
-  <license>
-    <name>Apache License 2.0: toml</name>
-    <url>https://github.com/alexcrichton/toml-rs/blob/master/LICENSE-APACHE</url>
-  </license>
   <license>
     <name>Apache License 2.0: toml</name>
     <url>https://github.com/toml-rs/toml/blob/main/LICENSE-APACHE</url>

megazords/ios-rust/DEPENDENCIES.md

@@ -563,7 +563,6 @@ The following text applies to code linked from these dependencies:
 [thiserror-impl](https://github.com/dtolnay/thiserror),
 [thiserror](https://github.com/dtolnay/thiserror),
 [thread_local](https://github.com/Amanieu/thread_local-rs),
-[toml](https://github.com/alexcrichton/toml-rs),
 [toml](https://github.com/toml-rs/toml),
 [toml_datetime](https://github.com/toml-rs/toml),
 [toml_parser](https://github.com/toml-rs/toml),

megazords/ios-rust/focus/DEPENDENCIES.md

@@ -499,7 +499,6 @@ The following text applies to code linked from these dependencies:
 [lazy_static](https://github.com/rust-lang-nursery/lazy-static.rs),
 [libc](https://github.com/rust-lang/libc),
 [libm](https://github.com/rust-lang/libm),
-[linux-raw-sys](https://github.com/sunfishcode/linux-raw-sys),
 [lock_api](https://github.com/Amanieu/parking_lot),
 [log](https://github.com/rust-lang/log),
 [minimal-lexical](https://github.com/Alexhuszagh/minimal-lexical),
@@ -546,7 +545,6 @@ The following text applies to code linked from these dependencies:
 [thiserror-impl](https://github.com/dtolnay/thiserror),
 [thiserror](https://github.com/dtolnay/thiserror),
 [thread_local](https://github.com/Amanieu/thread_local-rs),
-[toml](https://github.com/alexcrichton/toml-rs),
 [toml](https://github.com/toml-rs/toml),
 [toml_datetime](https://github.com/toml-rs/toml),
 [toml_parser](https://github.com/toml-rs/toml),

rust-toolchain.toml

@@ -7,7 +7,7 @@
 #   supported and used in CI.
 
 [toolchain]
-channel = "1.91.0"
+channel = "1.94.0"
 targets = [
     "aarch64-linux-android",
     "armv7-linux-androideabi",