Update Rust to 1.77.1, min supported Rust to 1.74

Author: mhammond

.circleci/config.yml

@@ -25,7 +25,7 @@ commands:
   # Our minimum supported rust version is specified here.
   prepare-rust-min-version:
     steps:
-      - run: rustup override set 1.66.0
+      - run: rustup override set 1.74.0
       - run: rustup update
   build-api-docs:
     steps:
@@ -42,7 +42,7 @@ orbs:
 jobs:
   Check Rust formatting:
     docker:
-      - image: cimg/rust:1.72
+      - image: cimg/rust:1.77.1
     resource_class: small
     steps:
       - checkout
@@ -52,7 +52,7 @@ jobs:
       - run: cargo fmt -- --check
   Lint Rust with clippy:
     docker:
-      - image: cimg/rust:1.72
+      - image: cimg/rust:1.77.1
     resource_class: small
     steps:
       - checkout
@@ -62,7 +62,7 @@ jobs:
       - run: cargo clippy --all --all-targets -- -D warnings
   Lint Rust Docs:
     docker:
-      - image: cimg/rust:1.72
+      - image: cimg/rust:1.77.1
     resource_class: small
     steps:
       - checkout
@@ -120,7 +120,7 @@ jobs:
       - run: cargo test -- --skip trybuild_ui_tests
   Deploy website:
     docker:
-      - image: cimg/rust:1.72
+      - image: cimg/rust:1.77.1
     resource_class: small
     steps:
       - checkout

docs/policies/rust-versions.md

@@ -39,16 +39,7 @@ Our official Rust version policy is:
 * This policy only applies to the "major" and "minor" versions - a different
   patch level is still considered compliant with this policy.
 
-## Implications of this
-
-All CI for this project will try and pin itself to this same version. At
-time of writing, this means that [our circle CI integration
-](https://github.com/mozilla/uniffi-rs/blob/main/.circleci/config.yml) and
-[rust-toolchain configuration](https://github.com/mozilla/uniffi-rs/blob/main/rust-toolchain.toml)
-will specify the version (and where possible, the CI configuration file will
-avoid duplicating the information in `rust-toolchain.toml`)
-
-We should maintain CI to ensure we still build with the "Requires" version.
+# Updating these versions
 
 As versions inside mozilla-central change, we will bump the UniFI versions
 accordingly. While newer versions of Rust can be expected to work correctly
@@ -57,6 +48,22 @@ with the new version. Thus, a PR to bump the minimum version is likely to also
 require a PR to make changes which keep clippy happy.
 
 In the interests of avoiding redundant information which will inevitably
-become stale, the circleci and rust-toolchain configuration links above
+become stale, the circleci and rust-toolchain configuration links below
 should be considered the canonical source of truth for the currently supported
 official Rust version.
+
+Unfortunately these versions are spread out over a few places.
+
+## Updating the "Uses" version
+
+* Update the version specified in [`rust-toolchain.toml`](https://github.com/mozilla/uniffi-rs/blob/main/rust-toolchain.toml)
+* In [our circle CI integration](https://github.com/mozilla/uniffi-rs/blob/main/.circleci/config.yml)
+  you will find a number of docker references similar to `cimg/rust:1.XX` - all of these
+  should be updated; while some tasks, such as publishing the docs, are largely indepdenent of
+  the requirements in this policy, we should keep them all consistent where we can.
+
+## Updating the "Minimum Supported Version
+
+* In [our circle CI integration](https://github.com/mozilla/uniffi-rs/blob/main/.circleci/config.yml)
+  you will find a task `prepare-rust-min-version` which specifies this version via executing
+  `rustup update` with the version. This is the version to update.

fixtures/coverall/src/lib.rs

@@ -158,7 +158,7 @@ fn get_complex_error(e: Option<ComplexError>) -> ComplexError {
 
 #[uniffi::export]
 fn get_error_dict(d: Option<ErrorDict>) -> ErrorDict {
-    d.unwrap_or(Default::default())
+    d.unwrap_or_default()
 }
 
 #[derive(Default, Debug, uniffi::Record)]
@@ -417,7 +417,7 @@ impl Coveralls {
     }
 
     fn get_other(&self) -> Option<Arc<Self>> {
-        (*self.other.lock().unwrap()).as_ref().map(Arc::clone)
+        (*self.other.lock().unwrap()).clone()
     }
 
     fn take_other_fallible(self: Arc<Self>) -> Result<()> {

fixtures/coverall/src/traits.rs

@@ -179,7 +179,7 @@ impl NodeTrait for Trait1 {
     }
 
     fn get_parent(&self) -> Option<Arc<dyn NodeTrait>> {
-        (*self.parent.lock().unwrap()).as_ref().map(Arc::clone)
+        (*self.parent.lock().unwrap()).clone()
     }
 }
 
@@ -197,7 +197,7 @@ impl NodeTrait for Trait2 {
     }
 
     fn get_parent(&self) -> Option<Arc<dyn NodeTrait>> {
-        (*self.parent.lock().unwrap()).as_ref().map(Arc::clone)
+        (*self.parent.lock().unwrap()).clone()
     }
 }
 

fixtures/metadata/src/tests.rs

@@ -93,10 +93,10 @@ pub trait Logger {
 }
 
 pub use calc::Calculator;
-pub use error::{ComplexError, FlatError};
+pub use error::FlatError;
 pub use person::Person;
 pub use state::State;
-pub use uniffi_traits::Special;
+
 pub use weapon::Weapon;
 
 mod test_type_ids {

fixtures/uitests/tests/ui/interface_not_sync_and_send.stderr

@@ -4,7 +4,27 @@ error[E0277]: `Cell<u32>` cannot be shared between threads safely
   | struct r#Counter { }
   |        ^^^^^^^^^ `Cell<u32>` cannot be shared between threads safely
   |
-  = help: within `Counter`, the trait `Sync` is not implemented for `Cell<u32>`
+  = help: within `Counter`, the trait `Sync` is not implemented for `Cell<u32>`, which is required by `Counter: Sync`
+  = note: if you want to do aliasing and mutation between multiple threads, use `std::sync::RwLock` or `std::sync::atomic::AtomicU32` instead
+note: required because it appears within the type `Counter`
+ --> tests/ui/interface_not_sync_and_send.rs:9:12
+  |
+9 | pub struct Counter {
+  |            ^^^^^^^
+note: required by a bound in `_::{closure#0}::assert_impl_all`
+ --> $OUT_DIR[uniffi_uitests]/counter.uniffi.rs
+  |
+  | #[::uniffi::derive_object_for_udl]
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
+  = note: this error originates in the macro `uniffi::deps::static_assertions::assert_impl_all` which comes from the expansion of the attribute macro `::uniffi::derive_object_for_udl` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: `Cell<u32>` cannot be shared between threads safely
+ --> $OUT_DIR[uniffi_uitests]/counter.uniffi.rs
+  |
+  | struct r#Counter { }
+  |        ^^^^^^^^^ `Cell<u32>` cannot be shared between threads safely
+  |
+  = help: within `Counter`, the trait `Sync` is not implemented for `Cell<u32>`, which is required by `Counter: Sync`
   = note: if you want to do aliasing and mutation between multiple threads, use `std::sync::RwLock` or `std::sync::atomic::AtomicU32` instead
 note: required because it appears within the type `Counter`
  --> tests/ui/interface_not_sync_and_send.rs:9:12
@@ -23,7 +43,27 @@ error[E0277]: `Cell<u32>` cannot be shared between threads safely
 27 | pub struct ProcMacroCounter {
    |            ^^^^^^^^^^^^^^^^ `Cell<u32>` cannot be shared between threads safely
    |
-   = help: within `ProcMacroCounter`, the trait `Sync` is not implemented for `Cell<u32>`
+   = help: within `ProcMacroCounter`, the trait `Sync` is not implemented for `Cell<u32>`, which is required by `ProcMacroCounter: Sync`
+   = note: if you want to do aliasing and mutation between multiple threads, use `std::sync::RwLock` or `std::sync::atomic::AtomicU32` instead
+note: required because it appears within the type `ProcMacroCounter`
+  --> tests/ui/interface_not_sync_and_send.rs:27:12
+   |
+27 | pub struct ProcMacroCounter {
+   |            ^^^^^^^^^^^^^^^^
+note: required by a bound in `_::{closure#0}::assert_impl_all`
+  --> tests/ui/interface_not_sync_and_send.rs:26:10
+   |
+26 | #[derive(uniffi::Object)]
+   |          ^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
+   = note: this error originates in the macro `uniffi::deps::static_assertions::assert_impl_all` which comes from the expansion of the derive macro `uniffi::Object` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: `Cell<u32>` cannot be shared between threads safely
+  --> tests/ui/interface_not_sync_and_send.rs:27:12
+   |
+27 | pub struct ProcMacroCounter {
+   |            ^^^^^^^^^^^^^^^^ `Cell<u32>` cannot be shared between threads safely
+   |
+   = help: within `ProcMacroCounter`, the trait `Sync` is not implemented for `Cell<u32>`, which is required by `ProcMacroCounter: Sync`
    = note: if you want to do aliasing and mutation between multiple threads, use `std::sync::RwLock` or `std::sync::atomic::AtomicU32` instead
 note: required because it appears within the type `ProcMacroCounter`
   --> tests/ui/interface_not_sync_and_send.rs:27:12

fixtures/uitests/tests/ui/interface_trait_not_sync_and_send.stderr

@@ -1,3 +1,31 @@
+error[E0277]: `dyn Trait` cannot be shared between threads safely
+ --> $OUT_DIR[uniffi_uitests]/trait.uniffi.rs
+  |
+  | #[::uniffi::export_for_udl]
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `dyn Trait` cannot be shared between threads safely
+  |
+  = help: the trait `Sync` is not implemented for `dyn Trait`
+note: required by a bound in `_::{closure#0}::assert_impl_all`
+ --> $OUT_DIR[uniffi_uitests]/trait.uniffi.rs
+  |
+  | #[::uniffi::export_for_udl]
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
+  = note: this error originates in the attribute macro `::uniffi::export_for_udl` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: `dyn Trait` cannot be sent between threads safely
+ --> $OUT_DIR[uniffi_uitests]/trait.uniffi.rs
+  |
+  | #[::uniffi::export_for_udl]
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ `dyn Trait` cannot be sent between threads safely
+  |
+  = help: the trait `Send` is not implemented for `dyn Trait`
+note: required by a bound in `_::{closure#0}::assert_impl_all`
+ --> $OUT_DIR[uniffi_uitests]/trait.uniffi.rs
+  |
+  | #[::uniffi::export_for_udl]
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
+  = note: this error originates in the attribute macro `::uniffi::export_for_udl` (in Nightly builds, run with -Z macro-backtrace for more info)
+
 error[E0277]: `(dyn Trait + 'static)` cannot be shared between threads safely
  --> $OUT_DIR[uniffi_uitests]/trait.uniffi.rs
   |
@@ -26,6 +54,34 @@ note: required by a bound in `FfiConverterArc`
   |                                       ^^^^ required by this bound in `FfiConverterArc`
   = note: this error originates in the attribute macro `::uniffi::export_for_udl` (in Nightly builds, run with -Z macro-backtrace for more info)
 
+error[E0277]: `dyn ProcMacroTrait` cannot be shared between threads safely
+  --> tests/ui/interface_trait_not_sync_and_send.rs:11:1
+   |
+11 | #[uniffi::export]
+   | ^^^^^^^^^^^^^^^^^ `dyn ProcMacroTrait` cannot be shared between threads safely
+   |
+   = help: the trait `Sync` is not implemented for `dyn ProcMacroTrait`
+note: required by a bound in `_::{closure#0}::assert_impl_all`
+  --> tests/ui/interface_trait_not_sync_and_send.rs:11:1
+   |
+11 | #[uniffi::export]
+   | ^^^^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
+   = note: this error originates in the attribute macro `uniffi::export` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: `dyn ProcMacroTrait` cannot be sent between threads safely
+  --> tests/ui/interface_trait_not_sync_and_send.rs:11:1
+   |
+11 | #[uniffi::export]
+   | ^^^^^^^^^^^^^^^^^ `dyn ProcMacroTrait` cannot be sent between threads safely
+   |
+   = help: the trait `Send` is not implemented for `dyn ProcMacroTrait`
+note: required by a bound in `_::{closure#0}::assert_impl_all`
+  --> tests/ui/interface_trait_not_sync_and_send.rs:11:1
+   |
+11 | #[uniffi::export]
+   | ^^^^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
+   = note: this error originates in the attribute macro `uniffi::export` (in Nightly builds, run with -Z macro-backtrace for more info)
+
 error[E0277]: `(dyn ProcMacroTrait + 'static)` cannot be shared between threads safely
   --> tests/ui/interface_trait_not_sync_and_send.rs:11:1
    |

fixtures/uitests/tests/ui/invalid_types_in_signatures.stderr

@@ -16,11 +16,28 @@ error[E0277]: the trait bound `Result<(), ErrorType>: Lift<UniFfiTag>` is not sa
            and $N others
    = note: this error originates in the attribute macro `uniffi::export` (in Nightly builds, run with -Z macro-backtrace for more info)
 
+error[E0277]: the trait bound `Result<(), ErrorType>: Lift<UniFfiTag>` is not satisfied
+  --> tests/ui/invalid_types_in_signatures.rs:18:25
+   |
+18 | pub fn input_result(_r: Result<(), ErrorType>) { }
+   |                         ^^^^^^^^^^^^^^^^^^^^^ the trait `Lift<UniFfiTag>` is not implemented for `Result<(), ErrorType>`
+   |
+   = help: the following other types implement trait `Lift<UT>`:
+             bool
+             i8
+             i16
+             i32
+             i64
+             u8
+             u16
+             u32
+           and $N others
+
 error[E0277]: the trait bound `Result<(), ErrorType>: Lower<UniFfiTag>` is not satisfied
   --> tests/ui/invalid_types_in_signatures.rs:20:1
    |
 20 | #[uniffi::export]
-   | ^^^^^^^^^^^^^^^^^ the trait `Lower<UniFfiTag>` is not implemented for `Result<(), ErrorType>`
+   | ^^^^^^^^^^^^^^^^^ the trait `Lower<UniFfiTag>` is not implemented for `Result<(), ErrorType>`, which is required by `Option<Result<(), ErrorType>>: LowerReturn<UniFfiTag>`
    |
    = help: the following other types implement trait `Lower<UT>`:
              bool
@@ -35,3 +52,22 @@ error[E0277]: the trait bound `Result<(), ErrorType>: Lower<UniFfiTag>` is not s
    = note: required for `Option<Result<(), ErrorType>>` to implement `Lower<UniFfiTag>`
    = note: required for `Option<Result<(), ErrorType>>` to implement `LowerReturn<UniFfiTag>`
    = note: this error originates in the attribute macro `uniffi::export` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: the trait bound `Result<(), ErrorType>: Lower<UniFfiTag>` is not satisfied
+  --> tests/ui/invalid_types_in_signatures.rs:21:34
+   |
+21 | pub fn return_option_result() -> Option<Result<(), ErrorType>> {
+   |                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Lower<UniFfiTag>` is not implemented for `Result<(), ErrorType>`, which is required by `Option<Result<(), ErrorType>>: LowerReturn<UniFfiTag>`
+   |
+   = help: the following other types implement trait `Lower<UT>`:
+             bool
+             i8
+             i16
+             i32
+             i64
+             u8
+             u16
+             u32
+           and $N others
+   = note: required for `Option<Result<(), ErrorType>>` to implement `Lower<UniFfiTag>`
+   = note: required for `Option<Result<(), ErrorType>>` to implement `LowerReturn<UniFfiTag>`

fixtures/uitests/tests/ui/non_hashable_record_key.stderr

@@ -1,8 +1,54 @@
+error[E0277]: the trait bound `f32: std::cmp::Eq` is not satisfied
+ --> $OUT_DIR[uniffi_uitests]/records.uniffi.rs
+  |
+  | uniffi::deps::static_assertions::assert_impl_all!(f32: ::std::cmp::Eq, ::std::hash::Hash); // record<f32, u64>
+  |                                                   ^^^ the trait `std::cmp::Eq` is not implemented for `f32`
+  |
+  = help: the following other types implement trait `std::cmp::Eq`:
+            isize
+            i8
+            i16
+            i32
+            i64
+            i128
+            usize
+            u8
+          and $N others
+note: required by a bound in `assert_impl_all`
+ --> $OUT_DIR[uniffi_uitests]/records.uniffi.rs
+  |
+  | uniffi::deps::static_assertions::assert_impl_all!(f32: ::std::cmp::Eq, ::std::hash::Hash); // record<f32, u64>
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
+  = note: this error originates in the macro `uniffi::deps::static_assertions::assert_impl_all` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: the trait bound `f32: Hash` is not satisfied
+ --> $OUT_DIR[uniffi_uitests]/records.uniffi.rs
+  |
+  | uniffi::deps::static_assertions::assert_impl_all!(f32: ::std::cmp::Eq, ::std::hash::Hash); // record<f32, u64>
+  |                                                   ^^^ the trait `Hash` is not implemented for `f32`
+  |
+  = help: the following other types implement trait `Hash`:
+            isize
+            i8
+            i16
+            i32
+            i64
+            i128
+            usize
+            u8
+          and $N others
+note: required by a bound in `assert_impl_all`
+ --> $OUT_DIR[uniffi_uitests]/records.uniffi.rs
+  |
+  | uniffi::deps::static_assertions::assert_impl_all!(f32: ::std::cmp::Eq, ::std::hash::Hash); // record<f32, u64>
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `assert_impl_all`
+  = note: this error originates in the macro `uniffi::deps::static_assertions::assert_impl_all` (in Nightly builds, run with -Z macro-backtrace for more info)
+
 error[E0277]: the trait bound `f32: Hash` is not satisfied
  --> $OUT_DIR[uniffi_uitests]/records.uniffi.rs
   |
   | #[::uniffi::export_for_udl]
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Hash` is not implemented for `f32`
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Hash` is not implemented for `f32`, which is required by `HashMap<f32, u64>: LowerReturn<UniFfiTag>`
   |
   = help: the following other types implement trait `Hash`:
             isize
@@ -22,7 +68,7 @@ error[E0277]: the trait bound `f32: std::cmp::Eq` is not satisfied
  --> $OUT_DIR[uniffi_uitests]/records.uniffi.rs
   |
   | #[::uniffi::export_for_udl]
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `f32`
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `f32`, which is required by `HashMap<f32, u64>: LowerReturn<UniFfiTag>`
   |
   = help: the following other types implement trait `std::cmp::Eq`:
             isize

fixtures/uitests/tests/ui/trait_methods_no_trait.stderr

@@ -19,6 +19,6 @@ error[E0277]: `TraitMethods` doesn't implement `std::fmt::Display`
   | #[uniffi::export(Display)]
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^ `TraitMethods` cannot be formatted with the default formatter
   |
-  = help: the trait `std::fmt::Display` is not implemented for `TraitMethods`
+  = help: the trait `std::fmt::Display` is not implemented for `TraitMethods`, which is required by `&TraitMethods: std::fmt::Display`
   = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
   = note: this error originates in the macro `$crate::__export::format_args` which comes from the expansion of the attribute macro `uniffi::export` (in Nightly builds, run with -Z macro-backtrace for more info)

rust-toolchain.toml

@@ -5,7 +5,7 @@
 # * ./.circleci/config.yml which also specifies the rust versions used in CI.
 
 [toolchain]
-channel = "1.72.0"
+channel = "1.77.1"
 targets = [
     "aarch64-linux-android",
     "armv7-linux-androideabi",