build: update to rust 1.84.0

grant0417 · grant0417 · commit 992ac0494f80 · 2025-01-10T09:24:19.000-08:00
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Install dependencies (macOS)
         if: runner.os == 'Macos'
         run: brew install protobuf fish shellcheck
-      - uses: dtolnay/rust-toolchain@1.83.0
+      - uses: dtolnay/rust-toolchain@1.84.0
         id: toolchain
         with:
           components: clippy
diff --git a/crates/alacritty_terminal/src/ansi.rs b/crates/alacritty_terminal/src/ansi.rs
@@ -109,10 +109,7 @@ fn parse_number(input: &[u8]) -> Option<u8> {
     for c in input {
         let c = *c as char;
         if let Some(digit) = c.to_digit(10) {
-            num = match num.checked_mul(10).and_then(|v| v.checked_add(digit as u8)) {
-                Some(v) => v,
-                None => return None,
-            }
+            num = num.checked_mul(10).and_then(|v| v.checked_add(digit as u8))?;
         } else {
             return None;
         }
@@ -1012,7 +1009,7 @@ where
         match (action, intermediates) {
             ('s', [b'=']) => {
                 // Start a synchronized update. The end is handled with a separate parser.
-                if params.iter().next().map_or(false, |param| param[0] == 1) {
+                if params.iter().next().is_some_and(|param| param[0] == 1) {
                     self.state.dcs = Some(Dcs::SyncStart);
                 }
             },
diff --git a/crates/fig_api_client/src/error.rs b/crates/fig_api_client/src/error.rs
@@ -55,14 +55,14 @@ impl Error {
     pub fn is_throttling_error(&self) -> bool {
         match self {
             Error::Credentials(_) => false,
-            Error::GenerateCompletions(e) => e.as_service_error().map_or(false, |e| e.is_throttling_error()),
-            Error::GenerateRecommendations(e) => e.as_service_error().map_or(false, |e| e.is_throttling_error()),
-            Error::ListAvailableCustomizations(e) => e.as_service_error().map_or(false, |e| e.is_throttling_error()),
-            Error::ListAvailableServices(e) => e.as_service_error().map_or(false, |e| e.is_throttling_error()),
+            Error::GenerateCompletions(e) => e.as_service_error().is_some_and(|e| e.is_throttling_error()),
+            Error::GenerateRecommendations(e) => e.as_service_error().is_some_and(|e| e.is_throttling_error()),
+            Error::ListAvailableCustomizations(e) => e.as_service_error().is_some_and(|e| e.is_throttling_error()),
+            Error::ListAvailableServices(e) => e.as_service_error().is_some_and(|e| e.is_throttling_error()),
             Error::CodewhispererGenerateAssistantResponse(e) => {
-                e.as_service_error().map_or(false, |e| e.is_throttling_error())
+                e.as_service_error().is_some_and(|e| e.is_throttling_error())
             },
-            Error::QDeveloperSendMessage(e) => e.as_service_error().map_or(false, |e| e.is_throttling_error()),
+            Error::QDeveloperSendMessage(e) => e.as_service_error().is_some_and(|e| e.is_throttling_error()),
             Error::CodewhispererChatResponseStream(_)
             | Error::QDeveloperChatResponseStream(_)
             | Error::SmithyBuild(_)
diff --git a/crates/fig_auth/src/builder_id.rs b/crates/fig_auth/src/builder_id.rs
@@ -547,7 +547,7 @@ pub async fn refresh_token() -> Result<Option<BuilderIdToken>> {
 }
 
 pub async fn is_amzn_user() -> Result<bool> {
-    Ok(builder_id_token().await?.map_or(false, |t| t.is_amzn_user()))
+    Ok(builder_id_token().await?.is_some_and(|t| t.is_amzn_user()))
 }
 
 pub async fn is_logged_in() -> bool {
diff --git a/crates/fig_desktop/src/platform/macos.rs b/crates/fig_desktop/src/platform/macos.rs
@@ -489,7 +489,7 @@ impl PlatformStateImpl {
                     // Checking if IME is installed is async :(
                     let enabled_proxy = self.proxy.clone();
                     tokio::spawn(async move {
-                        let is_terminal_disabled = current_terminal.as_ref().map_or(false, |terminal| {
+                        let is_terminal_disabled = current_terminal.as_ref().is_some_and(|terminal| {
                             fig_settings::settings::get_bool_or(
                                 format!("integrations.{}.disabled", terminal.internal_id()),
                                 false,
@@ -558,7 +558,7 @@ impl PlatformStateImpl {
                     let dashboard_visible = dashboard_visible.unwrap_or_else(|| {
                         window_map
                             .get(&DASHBOARD_ID)
-                            .map_or(false, |window| window.window.is_visible())
+                            .is_some_and(|window| window.window.is_visible())
                     });
 
                     if dashboard_visible {
diff --git a/crates/fig_desktop/src/protocol/icons.rs b/crates/fig_desktop/src/protocol/icons.rs
@@ -114,7 +114,7 @@ pub async fn process_asset(path: PathBuf) -> Result<ProcessedAsset> {
     let is_svg = path
         .extension()
         .and_then(OsStr::to_str)
-        .map_or(true, |ext| ext.to_lowercase() == "svg");
+        .is_none_or(|ext| ext.to_lowercase() == "svg");
 
     let built = if is_svg {
         (Arc::new(tokio::fs::read(&path).await?.into()), AssetKind::Svg)
diff --git a/crates/fig_desktop/src/remote_ipc/mod.rs b/crates/fig_desktop/src/remote_ipc/mod.rs
@@ -80,7 +80,7 @@ impl fig_remote_ipc::RemoteHookHandler for RemoteHook {
             let current_session_expired = session
                 .current_session_metrics
                 .as_ref()
-                .map_or(false, |metrics| received_at > metrics.end_time + Duration::from_secs(5));
+                .is_some_and(|metrics| received_at > metrics.end_time + Duration::from_secs(5));
 
             if current_session_expired {
                 let previous = session.current_session_metrics.clone();
diff --git a/crates/fig_desktop/src/utils.rs b/crates/fig_desktop/src/utils.rs
@@ -76,8 +76,7 @@ where
                     .headers()
                     .get("Accept")
                     .and_then(|accept| accept.to_str().ok())
-                    .and_then(|accept| accept.split('/').last())
-                    .map_or(false, |accept| accept == "json");
+                    .is_some_and(|accept| accept.split('/').last() == Some("json"));
 
                 let mut response = match f(ctx_clone, req, window_id.window_id()).in_current_span().await {
                     Ok(res) => res,
diff --git a/crates/fig_desktop_api/src/init_script.rs b/crates/fig_desktop_api/src/init_script.rs
@@ -113,7 +113,7 @@ impl Constants {
             new_uri_format: true,
             support_api_proto,
             api_proto_url: "api://localhost".to_string(),
-            midway: midway_cookie_path().map_or(false, |p| p.is_file()),
+            midway: midway_cookie_path().is_ok_and(|p| p.is_file()),
             #[cfg(target_os = "macos")]
             macos_version: macos_utils::os::OperatingSystemVersion::get().to_string(),
             #[cfg(target_os = "linux")]
diff --git a/crates/fig_os_shim/src/env.rs b/crates/fig_os_shim/src/env.rs
@@ -142,7 +142,7 @@ impl Env {
 
     pub fn in_cloudshell(&self) -> bool {
         self.get("AWS_EXECUTION_ENV")
-            .map_or(false, |v| v.trim().eq_ignore_ascii_case("cloudshell"))
+            .is_ok_and(|v| v.trim().eq_ignore_ascii_case("cloudshell"))
     }
 
     pub fn in_ssh(&self) -> bool {
diff --git a/crates/figterm/src/main.rs b/crates/figterm/src/main.rs
@@ -320,9 +320,9 @@ where
         Some(at) => {
             let lock_expired = at.elapsed().unwrap_or(Duration::ZERO) > Duration::from_millis(16);
             let should_unlock = lock_expired
-                || term.get_current_buffer().map_or(true, |buff| {
-                    &buff.buffer == (&EXPECTED_BUFFER.lock().unwrap() as &String)
-                });
+                || term
+                    .get_current_buffer()
+                    .is_none_or(|buff| &buff.buffer == (&EXPECTED_BUFFER.lock().unwrap() as &String));
             if should_unlock {
                 handle.take();
                 if lock_expired {
diff --git a/crates/q_cli/src/util/mod.rs b/crates/q_cli/src/util/mod.rs
@@ -310,7 +310,7 @@ pub async fn is_brew_reinstall() -> bool {
         .args(["aux", "-o", "args"])
         .output()
         .await
-        .map_or(false, |output| regex.is_match(&output.stdout))
+        .is_ok_and(|output| regex.is_match(&output.stdout))
 }
 
 #[cfg(test)]
diff --git a/crates/shell-color/src/lib.rs b/crates/shell-color/src/lib.rs
@@ -10,11 +10,11 @@ pub struct SuggestionColor {
 
 impl SuggestionColor {
     pub fn fg(&self) -> Option<VTermColor> {
-        self.fg.clone().map(VTermColor::from)
+        self.fg.clone()
     }
 
     pub fn bg(&self) -> Option<VTermColor> {
-        self.bg.clone().map(VTermColor::from)
+        self.bg.clone()
     }
 }
 
diff --git a/crates/zbus/src/abstractions/executor.rs b/crates/zbus/src/abstractions/executor.rs
@@ -37,7 +37,7 @@ pub struct Executor<'a> {
     phantom: PhantomData<&'a ()>,
 }
 
-impl<'a> Executor<'a> {
+impl Executor<'_> {
     /// Spawns a task onto the executor.
     #[doc(hidden)]
     pub fn spawn<T: Send + 'static>(
diff --git a/crates/zbus/src/address/transport/mod.rs b/crates/zbus/src/address/transport/mod.rs
@@ -267,10 +267,10 @@ pub(crate) fn decode_percents(value: &str) -> Result<Vec<u8>> {
             decoded.push(c as u8);
         } else if c == '%' {
             decoded.push(
-                decode_hex(
+                (decode_hex(
                     iter.next()
                         .ok_or_else(|| Error::Address("incomplete percent-encoded sequence".to_owned()))?,
-                )? << 4
+                )? << 4)
                     | decode_hex(
                         iter.next()
                             .ok_or_else(|| Error::Address("incomplete percent-encoded sequence".to_owned()))?,
diff --git a/crates/zbus/src/guid.rs b/crates/zbus/src/guid.rs
@@ -146,7 +146,7 @@ impl<'de> Deserialize<'de> for Guid<'de> {
 }
 
 fn validate_guid(value: &str) -> crate::Result<()> {
-    if value.as_bytes().len() != 32 || value.chars().any(|c| !char::is_ascii_hexdigit(&c)) {
+    if value.len() != 32 || value.chars().any(|c| !char::is_ascii_hexdigit(&c)) {
         return Err(crate::Error::InvalidGUID);
     }
 
diff --git a/crates/zbus/src/message/field.rs b/crates/zbus/src/message/field.rs
@@ -151,19 +151,15 @@ impl<'de: 'f, 'f> Deserialize<'de> for Field<'f> {
             FieldCode::Path => Field::Path(ObjectPath::try_from(value).map_err(D::Error::custom)?),
             FieldCode::Interface => Field::Interface(InterfaceName::try_from(value).map_err(D::Error::custom)?),
             FieldCode::Member => Field::Member(MemberName::try_from(value).map_err(D::Error::custom)?),
-            FieldCode::ErrorName => {
-                Field::ErrorName(ErrorName::try_from(value).map(Into::into).map_err(D::Error::custom)?)
-            },
+            FieldCode::ErrorName => Field::ErrorName(ErrorName::try_from(value).map_err(D::Error::custom)?),
             FieldCode::ReplySerial => {
                 let value = u32::try_from(value)
                     .map_err(D::Error::custom)
                     .and_then(|v| v.try_into().map_err(D::Error::custom))?;
                 Field::ReplySerial(value)
             },
-            FieldCode::Destination => {
-                Field::Destination(BusName::try_from(value).map(Into::into).map_err(D::Error::custom)?)
-            },
-            FieldCode::Sender => Field::Sender(UniqueName::try_from(value).map(Into::into).map_err(D::Error::custom)?),
+            FieldCode::Destination => Field::Destination(BusName::try_from(value).map_err(D::Error::custom)?),
+            FieldCode::Sender => Field::Sender(UniqueName::try_from(value).map_err(D::Error::custom)?),
             FieldCode::Signature => Field::Signature(Signature::try_from(value).map_err(D::Error::custom)?),
             FieldCode::UnixFDs => Field::UnixFDs(u32::try_from(value).map_err(D::Error::custom)?),
         })
diff --git a/crates/zbus/src/proxy/mod.rs b/crates/zbus/src/proxy/mod.rs
@@ -189,7 +189,7 @@ pub struct PropertyChanged<'a, T> {
     phantom: std::marker::PhantomData<T>,
 }
 
-impl<'a, T> PropertyChanged<'a, T> {
+impl<T> PropertyChanged<'_, T> {
     /// The name of the property that changed.
     pub fn name(&self) -> &str {
         self.name
@@ -200,7 +200,7 @@ impl<'a, T> PropertyChanged<'a, T> {
     /// If the notification signal contained the new value, it has been cached already and this call
     /// will return that value. Otherwise (i.e. invalidated property), a D-Bus call is made to fetch
     /// and cache the new value.
-    pub async fn get_raw<'p>(&'p self) -> Result<impl Deref<Target = Value<'static>> + 'p> {
+    pub async fn get_raw(&self) -> Result<impl Deref<Target = Value<'static>> + '_> {
         struct Wrapper<'w> {
             name: &'w str,
             values: RwLockReadGuard<'w, HashMap<String, PropertyValue>>,
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.83.0"
+channel = "1.84.0"
 profile = "minimal"
 components = ["rustfmt", "clippy"]
 targets = [

Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ pub async fn refresh_token() -> Result<Option<BuilderIdToken>> {`
`547`	`547`	`}`
`548`	`548`
`549`	`549`	`pub async fn is_amzn_user() -> Result<bool> {`
`550`		`- Ok(builder_id_token().await?.map_or(false, \|t\| t.is_amzn_user()))`
	`550`	`+ Ok(builder_id_token().await?.is_some_and(\|t\| t.is_amzn_user()))`
`551`	`551`	`}`
`552`	`552`
`553`	`553`	`pub async fn is_logged_in() -> bool {`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ impl Env {`
`142`	`142`
`143`	`143`	`pub fn in_cloudshell(&self) -> bool {`
`144`	`144`	`self.get("AWS_EXECUTION_ENV")`
`145`		`- .map_or(false, \|v\| v.trim().eq_ignore_ascii_case("cloudshell"))`
	`145`	`+ .is_ok_and(\|v\| v.trim().eq_ignore_ascii_case("cloudshell"))`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`pub fn in_ssh(&self) -> bool {`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ pub async fn is_brew_reinstall() -> bool {`
`310`	`310`	`.args(["aux", "-o", "args"])`
`311`	`311`	`.output()`
`312`	`312`	`.await`
`313`		`- .map_or(false, \|output\| regex.is_match(&output.stdout))`
	`313`	`+ .is_ok_and(\|output\| regex.is_match(&output.stdout))`
`314`	`314`	`}`
`315`	`315`
`316`	`316`	`#[cfg(test)]`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ pub struct SuggestionColor {`
`10`	`10`
`11`	`11`	`impl SuggestionColor {`
`12`	`12`	`pub fn fg(&self) -> Option<VTermColor> {`
`13`		`- self.fg.clone().map(VTermColor::from)`
	`13`	`+ self.fg.clone()`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`pub fn bg(&self) -> Option<VTermColor> {`
`17`		`- self.bg.clone().map(VTermColor::from)`
	`17`	`+ self.bg.clone()`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ pub struct Executor<'a> {`
`37`	`37`	`phantom: PhantomData<&'a ()>,`
`38`	`38`	`}`
`39`	`39`
`40`		`-impl<'a> Executor<'a> {`
	`40`	`+impl Executor<'_> {`
`41`	`41`	`/// Spawns a task onto the executor.`
`42`	`42`	`#[doc(hidden)]`
`43`	`43`	`pub fn spawn<T: Send + 'static>(`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ impl<'de> Deserialize<'de> for Guid<'de> {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`fn validate_guid(value: &str) -> crate::Result<()> {`
`149`		`- if value.as_bytes().len() != 32 \|\| value.chars().any(\|c\| !char::is_ascii_hexdigit(&c)) {`
	`149`	`+ if value.len() != 32 \|\| value.chars().any(\|c\| !char::is_ascii_hexdigit(&c)) {`
`150`	`150`	`return Err(crate::Error::InvalidGUID);`
`151`	`151`	`}`
`152`	`152`