Updating Rust version to 1.0.87

bendk · bendk · commit a913e000df74 · 2025-06-17T13:33:00.000Z
This matches the Rust version Destkop v141.
It fixes the cargo-audit GH action, which was failing before because the
Rust version was too old.

* Applied changes from `cargo clippy --fix`.
* Updated docstring indentation because of new clippy errors
* Updating ctest `0.4.10`
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/fxa-client/src/device.rs b/components/fxa-client/src/device.rs
@@ -53,8 +53,7 @@ impl FirefoxAccount {
         supported_capabilities: Vec<DeviceCapability>,
     ) -> ApiResult<LocalDevice> {
         // UniFFI doesn't have good handling of lists of references, work around it.
-        let supported_capabilities: Vec<_> =
-            supported_capabilities.into_iter().map(Into::into).collect();
+        let supported_capabilities: Vec<_> = supported_capabilities.into_iter().collect();
         self.internal
             .lock()
             .initialize_device(name, device_type, &supported_capabilities)
@@ -188,8 +187,7 @@ impl FirefoxAccount {
         &self,
         supported_capabilities: Vec<DeviceCapability>,
     ) -> ApiResult<LocalDevice> {
-        let supported_capabilities: Vec<_> =
-            supported_capabilities.into_iter().map(Into::into).collect();
+        let supported_capabilities: Vec<_> = supported_capabilities.into_iter().collect();
         self.internal
             .lock()
             .ensure_capabilities(&supported_capabilities)
diff --git a/components/fxa-client/src/internal/config.rs b/components/fxa-client/src/internal/config.rs
@@ -94,29 +94,26 @@ impl Config {
 
     pub fn connect_another_device_url(&self) -> Result<Url> {
         self.content_url_path("connect_another_device")
-            .map_err(Into::into)
     }
 
     pub fn pair_url(&self) -> Result<Url> {
-        self.content_url_path("pair").map_err(Into::into)
+        self.content_url_path("pair")
     }
 
     pub fn pair_supp_url(&self) -> Result<Url> {
-        self.content_url_path("pair/supp").map_err(Into::into)
+        self.content_url_path("pair/supp")
     }
 
     pub fn oauth_force_auth_url(&self) -> Result<Url> {
         self.content_url_path("oauth/force_auth")
-            .map_err(Into::into)
     }
 
     pub fn settings_url(&self) -> Result<Url> {
-        self.content_url_path("settings").map_err(Into::into)
+        self.content_url_path("settings")
     }
 
     pub fn settings_clients_url(&self) -> Result<Url> {
         self.content_url_path("settings/clients")
-            .map_err(Into::into)
     }
 
     pub fn auth_url(&self) -> Result<Url> {
diff --git a/components/fxa-client/src/internal/device.rs b/components/fxa-client/src/internal/device.rs
@@ -417,7 +417,6 @@ impl TryFrom<Device> for crate::Device {
                 commands::close_tabs::COMMAND_NAME => Some(DeviceCapability::CloseTabs),
                 _ => None,
             })
-            .map(Into::into)
             .collect();
         Ok(crate::Device {
             id: d.common.id,
diff --git a/components/fxa-client/src/internal/mod.rs b/components/fxa-client/src/internal/mod.rs
@@ -160,7 +160,7 @@ impl FirefoxAccount {
     /// all the details of their account.
     ///
     /// * `entrypoint` - Application-provided string identifying the UI touchpoint
-    ///                  through which the page was accessed, for metrics purposes.
+    ///   through which the page was accessed, for metrics purposes.
     pub fn get_manage_account_url(&mut self, entrypoint: &str) -> Result<String> {
         let mut url = self.state.config().settings_url()?;
         url.query_pairs_mut().append_pair("entrypoint", entrypoint);
@@ -177,7 +177,7 @@ impl FirefoxAccount {
     /// the devices connected to their account.
     ///
     /// * `entrypoint` - Application-provided string identifying the UI touchpoint
-    ///                  through which the page was accessed, for metrics purposes.
+    ///   through which the page was accessed, for metrics purposes.
     pub fn get_manage_devices_url(&mut self, entrypoint: &str) -> Result<String> {
         let mut url = self.state.config().settings_clients_url()?;
         url.query_pairs_mut().append_pair("entrypoint", entrypoint);
diff --git a/components/fxa-client/src/internal/oauth.rs b/components/fxa-client/src/internal/oauth.rs
@@ -562,7 +562,7 @@ impl TryFrom<AccessTokenInfo> for crate::AccessTokenInfo {
         Ok(crate::AccessTokenInfo {
             scope: info.scope,
             token: info.token,
-            key: info.key.map(ScopedKey::into),
+            key: info.key,
             expires_at: info.expires_at.try_into()?,
         })
     }
diff --git a/components/logins/src/login.rs b/components/logins/src/login.rs
@@ -105,11 +105,11 @@
 //!   - Add a field with the original unicode versions of the URLs instead of punycode?
 //!
 //! - `sec_fields`: The `username` and `password` for the site, stored as a encrypted JSON
-//!    representation of an `SecureLoginFields`.
+//!   representation of an `SecureLoginFields`.
 //!
 //!   This field is required and usually encrypted.  There are two different value types:
-//!       - Plaintext empty string: Used for deleted records
-//!       - Encrypted value: The credentials associated with the login.
+//!   - Plaintext empty string: Used for deleted records
+//!   - Encrypted value: The credentials associated with the login.
 //!
 //! - `http_realm`:  The challenge string for HTTP Basic authentication, if any.
 //!
@@ -242,7 +242,7 @@
 //!   - test that we correctly merge dupes
 //!
 //! - `time_password_changed`: A lower bound on the time that the `password` field was last changed, in integer
-//!                          milliseconds from the unix epoch.
+//!   milliseconds from the unix epoch.
 //!
 //!   Changes to other fields (such as `username`) are not reflected in this timestamp.
 //!   This is a lower bound because some legacy sync clients do not record this information;
@@ -273,10 +273,10 @@
 //! callers to ensure that they're only working with valid records:
 //!
 //! - `Login::check_valid()`:    Checks validity of a login record, returning `()` if it is valid
-//!                              or an error if it is not.
+//!   or an error if it is not.
 //!
 //! - `Login::fixup()`:   Returns either the existing login if it is valid, a clone with invalid fields
-//!                       fixed up if it was safe to do so, or an error if the login is irreparably invalid.
+//!   fixed up if it was safe to do so, or an error if the login is irreparably invalid.
 
 use crate::{encryption::EncryptorDecryptor, error::*};
 use rusqlite::Row;
diff --git a/components/nimbus/src/evaluator.rs b/components/nimbus/src/evaluator.rs
@@ -135,8 +135,8 @@ pub fn evaluate_enrollment(
 /// - `app_context` The application parameters to use for targeting purposes
 /// - `exp` The `Experiment` to evaluate
 /// - `is_release` Supports two modes:
-///     if `true`, available means available for enrollment: i.e. does the `app_name` and `channel` match.
-///     if `false`, available means available for testing: i.e. does only the `app_name` match.
+///   if `true`, available means available for enrollment: i.e. does the `app_name` and `channel` match.
+///   if `false`, available means available for testing: i.e. does only the `app_name` match.
 ///
 /// # Returns:
 /// Returns `true` if the experiment matches the targeting
diff --git a/components/nimbus/src/stateful/persistence.rs b/components/nimbus/src/stateful/persistence.rs
@@ -114,15 +114,15 @@ pub enum StoreId {
     /// are serialized items whose type depends on the constant. Known constraints
     /// include:
     ///   * "db_version":   u16, the version number of the most revent migration
-    ///                     applied to this database.
+    ///     applied to this database.
     ///   * "nimbus-id":    String, the randomly-generated identifier for the
-    ///                     current client instance.
+    ///     current client instance.
     ///   * "user-opt-in":  bool, whether the user has explicitly opted in or out
-    ///                     of participating in experiments.
+    ///     of participating in experiments.
     ///   * "installation-date": a UTC DateTime string, defining the date the consuming app was
-    ///                     installed
+    ///     installed
     ///   * "update-date": a UTC DateTime string, defining the date the consuming app was
-    ///                     last updated
+    ///     last updated
     ///   * "app-version": String, the version of the app last persisted
     Meta,
     /// Store containing pending updates to experiment data.
diff --git a/components/places/src/bookmark_sync/mod.rs b/components/places/src/bookmark_sync/mod.rs
@@ -78,10 +78,10 @@ impl ToSql for SyncedBookmarkKind {
 /// `mozISyncedBookmarksMerger`. In short:
 /// * `Valid` means the record is valid and should be merged as usual.
 /// * `Reupload` means a remote item can be fixed up and applied,
-///    and should be reuploaded.
+///   and should be reuploaded.
 /// * `Replace` means a remote item isn't valid at all, and should either be
-///    replaced with a valid local copy, or deleted if a valid local copy
-///    doesn't exist.
+///   replaced with a valid local copy, or deleted if a valid local copy
+///   doesn't exist.
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[repr(u8)]
 pub enum SyncedBookmarkValidity {
diff --git a/components/places/src/ffi.rs b/components/places/src/ffi.rs
@@ -482,7 +482,7 @@ impl PlacesConnection {
     ) -> ApiResult<Option<BookmarkItem>> {
         self.with_conn(|conn| {
             let bookmark = bookmarks::fetch::fetch_bookmark(conn, guid, get_direct_children)?;
-            Ok(bookmark.map(BookmarkItem::from))
+            Ok(bookmark)
         })
     }
 
diff --git a/components/places/src/observation.rs b/components/places/src/observation.rs
@@ -88,7 +88,7 @@ impl VisitObservation {
     }
 
     pub fn with_referrer(mut self, v: impl Into<Option<Url>>) -> Self {
-        self.referrer = v.into().map(Url::into);
+        self.referrer = v.into();
         self
     }
 
diff --git a/components/search/src/selector.rs b/components/search/src/selector.rs
@@ -44,9 +44,8 @@ impl SearchEngineSelector {
     ///   - `service`: The remote settings service instance for the application.
     ///   - `options`: The remote settings options to be passed to the client(s).
     ///   - `apply_engine_overrides`: Whether or not to apply overrides from
-    ///                               `search-config-v2-overrides` to the selected
-    ///                               engines. Should be false unless the application
-    ///                               supports the click URL feature.
+    ///     `search-config-v2-overrides` to the selected engines. Should be false unless the
+    ///     application supports the click URL feature.
     pub fn use_remote_settings_server(
         self: Arc<Self>,
         service: &Arc<RemoteSettingsService>,
diff --git a/components/suggest/src/rs.rs b/components/suggest/src/rs.rs
@@ -397,7 +397,7 @@ pub fn iterate_keywords<'a>(
     let full_keywords_iter = full_keywords
         .iter()
         .flat_map(|(full_keyword, repeat_for)| {
-            std::iter::repeat(Some(full_keyword.as_str())).take(*repeat_for)
+            std::iter::repeat_n(Some(full_keyword.as_str()), *repeat_for)
         })
         .chain(std::iter::repeat(None)); // In case of insufficient full keywords, just fill in with infinite `None`s
                                          //
diff --git a/components/suggest/src/schema.rs b/components/suggest/src/schema.rs
@@ -18,7 +18,7 @@ use sql_support::{
 ///  2. Add a migration from the old version to the new version in
 ///     [`SuggestConnectionInitializer::upgrade_from`].
 ///     a. If suggestions should be re-ingested after the migration, call `clear_database()` inside
-///        the migration.
+///     the migration.
 ///  3. If the migration adds any tables, delete their their rows in
 ///     `clear_database()` by adding their names to `conditional_tables`, unless
 ///     they are cleared via a deletion trigger or there's some other good
diff --git a/components/suggest/src/store.rs b/components/suggest/src/store.rs
@@ -387,9 +387,7 @@ impl SuggestIngestionConstraints {
             .and_then(|c| c.dynamic_suggestion_types.as_ref())
         {
             None => false,
-            Some(suggestion_types) => suggestion_types
-                .iter()
-                .any(|t| *t == record.suggestion_type),
+            Some(suggestion_types) => suggestion_types.contains(&record.suggestion_type),
         }
     }
 
diff --git a/components/support/firefox-versioning/src/version.rs b/components/support/firefox-versioning/src/version.rs
@@ -39,10 +39,10 @@
 //! ### Special values and cases
 //! There two special characters that can be used in version parts:
 //! 1. The `*`. This can be used to represent the whole version part. If used, it will set the `num_a` to be
-//!     the maximum value possible ([`i32::MAX`]). This can only be used as the whole version part string. It will parsed
-//!     normally as the `*` ascii character if it is preceded or followed by any other characters.
+//!    the maximum value possible ([`i32::MAX`]). This can only be used as the whole version part string. It will parsed
+//!    normally as the `*` ascii character if it is preceded or followed by any other characters.
 //! 1. The `+`. This can be used as the `str_b`. Whenever a `+` is used as a `str_b`, it increments the `num_a` by 1 and sets
-//!     the `str_b` to be equal to `pre`. For example, `2+` is the same as `3pre`
+//!    the `str_b` to be equal to `pre`. For example, `2+` is the same as `3pre`
 //! 1. An empty `str_b` is always **greater** than a `str_b` with a value. For example, `93` > `93pre`
 //!
 //! ## Example version comparisons
diff --git a/components/support/nimbus-fml/src/backends/kotlin/mod.rs b/components/support/nimbus-fml/src/backends/kotlin/mod.rs
@@ -24,7 +24,7 @@ impl AboutBlock {
 
     fn nimbus_object_name_kt(&self) -> String {
         let fqe = self.nimbus_fully_qualified_name();
-        let last = fqe.split('.').last().unwrap_or(&fqe);
+        let last = fqe.split('.').next_back().unwrap_or(&fqe);
         last.to_string()
     }
 
diff --git a/components/support/nimbus-fml/src/defaults/merger.rs b/components/support/nimbus-fml/src/defaults/merger.rs
@@ -142,7 +142,7 @@ impl<'object> DefaultsMerger<'object> {
     /// # Arguments
     /// - `feature_def`: a [`FeatureDef`] representing the feature definition to transform
     /// - `channel`: a [`Option<&String>`] representing the channel to merge back into the field variables.
-    ///    If the `channel` is `None` we default to using the `release` channel.
+    ///   If the `channel` is `None` we default to using the `release` channel.
     /// - `supported_channels`: a [`&[String]`] representing the channels that are supported by the manifest
     ///
     /// # Returns
@@ -218,7 +218,7 @@ impl<'object> DefaultsMerger<'object> {
 /// # Arguments:
 /// - `old_default`: a reference to a [`serde_json::Value`], that represents the old default
 /// - `new_default`: a reference to a [`serde_json::Value`], that represents the new default, this takes
-///     precedence over the `old_default` if they have conflicting fields
+///   precedence over the `old_default` if they have conflicting fields
 ///
 /// # Returns
 /// A merged [`serde_json::Value`] that contains all fields from `old_default` and `new_default`, merging
@@ -265,7 +265,7 @@ fn merge_two_defaults(
 /// Will return errors in the following cases (not exhaustive):
 /// - The `defaults` argument is not an array
 /// - There is a `channel` in the `defaults` argument that doesn't
-///     exist in the `channels` argument
+///   exist in the `channels` argument
 fn collect_channel_defaults(
     defaults: &[DefaultBlock],
     channels: &[String],
diff --git a/components/support/nimbus-fml/src/defaults/validator.rs b/components/support/nimbus-fml/src/defaults/validator.rs
@@ -382,7 +382,7 @@ impl<'a> DefaultsValidator<'a> {
     ///
     /// - path The error path at which to report any errors
     /// - typ The type of the value we're validating. Only objects, structural types and string-aliases will do anything.
-    ///     We'll be recursing into this type.
+    ///   We'll be recursing into this type.
     /// - value The value we're validating. We'll be recursing into this value.
     /// - definitions The properties in this feature that define the string-alias types.
     /// - feature_value The merged value for the entire feature
diff --git a/components/support/nimbus-fml/src/editing/error_path.rs b/components/support/nimbus-fml/src/editing/error_path.rs
@@ -136,7 +136,7 @@ fn collect_path(literals: &mut Vec<String>, value: &Value) {
 
         Value::Object(map) => {
             literals.push(String::from("{"));
-            if let Some((k, v)) = map.iter().last() {
+            if let Some((k, v)) = map.iter().next_back() {
                 literals.push(format!("\"{k}\""));
                 collect_path(literals, v);
             }
diff --git a/components/support/nimbus-fml/src/util/loaders.rs b/components/support/nimbus-fml/src/util/loaders.rs
@@ -202,7 +202,7 @@ impl FilePath {
                 ext.to_str()?
             }
             Self::GitHub(GitHubRepoFilePath { url, .. }) | Self::Remote(url) => {
-                let file = url.path_segments()?.last()?;
+                let file = url.path_segments()?.next_back()?;
                 let (_, ext) = file.rsplit_once('.')?;
                 ext
             }
@@ -491,7 +491,7 @@ impl FileLoader {
         url.hash(&mut hasher);
         let checksum = hasher.finish();
         let filename = match url.path_segments() {
-            Some(segments) => segments.last().unwrap_or("unknown.txt"),
+            Some(mut segments) => segments.next_back().unwrap_or("unknown.txt"),
             None => "unknown.txt",
         };
         // Take the last 16 bytes of the hash to make sure our prefixes are still random, but
diff --git a/components/sync15/src/bso/mod.rs b/components/sync15/src/bso/mod.rs
@@ -5,14 +5,14 @@
 /// This module defines our core "bso" abstractions.
 /// In the terminology of this crate:
 /// * "bso" is an acronym for "basic storage object" and used extensively in the sync server docs.
-///    the record always has a well-defined "envelope" with metadata (eg, the ID of the record,
-///    the server timestamp of the resource,  etc) and a field called `payload`.
-///    A bso is serialized to and from JSON.
+///   the record always has a well-defined "envelope" with metadata (eg, the ID of the record,
+///   the server timestamp of the resource,  etc) and a field called `payload`.
+///   A bso is serialized to and from JSON.
 /// * There's a "cleartext" bso:
 ///   * The payload is a String, which itself is JSON encoded (ie, this string `payload` is
-///      always double JSON encoded in a server record)
+///     always double JSON encoded in a server record)
 ///   * This supplies helper methods for working with the "content" (some arbitrary <T>) in the
-///      payload.
+///     payload.
 /// * There's an "encrypted" bso
 ///   * The payload is an [crate::enc_payload::EncryptedPayload]
 ///   * Only clients use this; as soon as practical we decrypt and as late as practical we encrypt
diff --git a/components/sync15/src/client/state.rs b/components/sync15/src/client/state.rs
@@ -592,7 +592,7 @@ enum SetupState {
 impl SetupState {
     fn label(&self) -> &'static str {
         match self {
-            Initial { .. } => "Initial",
+            Initial => "Initial",
             InitialWithConfig { .. } => "InitialWithConfig",
             InitialWithInfo { .. } => "InitialWithInfo",
             InitialWithMetaGlobal { .. } => "InitialWithMetaGlobal",
diff --git a/components/viaduct/src/headers/name.rs b/components/viaduct/src/headers/name.rs
@@ -61,7 +61,7 @@ impl InvalidHeaderName {
 }
 
 fn validate_header(mut name: Cow<'static, str>) -> Result<HeaderName, InvalidHeaderName> {
-    if name.len() == 0 {
+    if name.is_empty() {
         return Err(invalid_header_name(name));
     }
     let mut need_lower_case = false;
diff --git a/examples/cli-support/src/prompt.rs b/examples/cli-support/src/prompt.rs
@@ -24,10 +24,7 @@ pub fn prompt_string<S: AsRef<str>>(prompt: S) -> Option<String> {
 }
 
 pub fn prompt_password<S: AsRef<str>>(prompt: S) -> Option<String> {
-    match rpassword::prompt_password(format!("{}: ", prompt.as_ref())) {
-        Ok(password) => Some(password),
-        Err(_) => None,
-    }
+    rpassword::prompt_password(format!("{}: ", prompt.as_ref())).ok()
 }
 
 pub fn prompt_char(msg: &str) -> Option<char> {
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -7,7 +7,7 @@
 #   supported and used in CI.
 
 [toolchain]
-channel = "1.84.0"
+channel = "1.87.0"
 targets = [
     "aarch64-linux-android",
     "armv7-linux-androideabi",

Original file line number	Diff line number	Diff line change
`@@ -94,29 +94,26 @@ impl Config {`
`94`	`94`
`95`	`95`	`pub fn connect_another_device_url(&self) -> Result<Url> {`
`96`	`96`	`self.content_url_path("connect_another_device")`
`97`		`- .map_err(Into::into)`
`98`	`97`	`}`
`99`	`98`
`100`	`99`	`pub fn pair_url(&self) -> Result<Url> {`
`101`		`- self.content_url_path("pair").map_err(Into::into)`
	`100`	`+ self.content_url_path("pair")`
`102`	`101`	`}`
`103`	`102`
`104`	`103`	`pub fn pair_supp_url(&self) -> Result<Url> {`
`105`		`- self.content_url_path("pair/supp").map_err(Into::into)`
	`104`	`+ self.content_url_path("pair/supp")`
`106`	`105`	`}`
`107`	`106`
`108`	`107`	`pub fn oauth_force_auth_url(&self) -> Result<Url> {`
`109`	`108`	`self.content_url_path("oauth/force_auth")`
`110`		`- .map_err(Into::into)`
`111`	`109`	`}`
`112`	`110`
`113`	`111`	`pub fn settings_url(&self) -> Result<Url> {`
`114`		`- self.content_url_path("settings").map_err(Into::into)`
	`112`	`+ self.content_url_path("settings")`
`115`	`113`	`}`
`116`	`114`
`117`	`115`	`pub fn settings_clients_url(&self) -> Result<Url> {`
`118`	`116`	`self.content_url_path("settings/clients")`
`119`		`- .map_err(Into::into)`
`120`	`117`	`}`
`121`	`118`
`122`	`119`	`pub fn auth_url(&self) -> Result<Url> {`
Original file line number	Diff line number	Diff line change
`@@ -562,7 +562,7 @@ impl TryFrom<AccessTokenInfo> for crate::AccessTokenInfo {`
`562`	`562`	`Ok(crate::AccessTokenInfo {`
`563`	`563`	`scope: info.scope,`
`564`	`564`	`token: info.token,`
`565`		`- key: info.key.map(ScopedKey::into),`
	`565`	`+ key: info.key,`
`566`	`566`	`expires_at: info.expires_at.try_into()?,`
`567`	`567`	`})`
`568`	`568`	`}`