Collapse a few nested if now that we have if let chains

Author: sandhose

crates/cli/build.rs

@@ -12,13 +12,13 @@ fn main() -> anyhow::Result<()> {
     // At build time, we override the version through the environment variable
     // VERGEN_GIT_DESCRIBE. In some contexts, it means this variable is set but
     // empty, so we unset it here.
-    if let Ok(ver) = std::env::var("VERGEN_GIT_DESCRIBE") {
-        if ver.is_empty() {
-            #[allow(unsafe_code)]
-            // SAFETY: This is safe because the build script is running a single thread
-            unsafe {
-                std::env::remove_var("VERGEN_GIT_DESCRIBE");
-            }
+    if let Ok(ver) = std::env::var("VERGEN_GIT_DESCRIBE")
+        && ver.is_empty()
+    {
+        #[allow(unsafe_code)]
+        // SAFETY: This is safe because the build script is running a single thread
+        unsafe {
+            std::env::remove_var("VERGEN_GIT_DESCRIBE");
         }
     }
 

crates/cli/src/app_state.rs

@@ -275,10 +275,10 @@ fn infer_client_ip(
 
     let peer = if let Some(info) = connection_info {
         // We can always trust the proxy protocol to give us the correct IP address
-        if let Some(proxy) = info.get_proxy_ref() {
-            if let Some(source) = proxy.source() {
-                return Some(source.ip());
-            }
+        if let Some(proxy) = info.get_proxy_ref()
+            && let Some(source) = proxy.source()
+        {
+            return Some(source.ip());
         }
 
         info.get_peer_addr().map(|addr| addr.ip())

crates/cli/src/commands/manage.rs

@@ -619,13 +619,12 @@ impl Options {
                 let txn = conn.begin().await?;
                 let mut repo = PgRepository::from_conn(txn);
 
-                if let Some(password) = &password {
-                    if !ignore_password_complexity
-                        && !password_manager.is_password_complex_enough(password)?
-                    {
-                        error!("That password is too weak.");
-                        return Ok(ExitCode::from(1));
-                    }
+                if let Some(password) = &password
+                    && !ignore_password_complexity
+                    && !password_manager.is_password_complex_enough(password)?
+                {
+                    error!("That password is too weak.");
+                    return Ok(ExitCode::from(1));
                 }
 
                 // If the username is provided, check if it's available and normalize it.

crates/cli/src/sync.rs

@@ -208,11 +208,11 @@ pub async fn config_sync(
                     // private key to hold the content of the private key file.
                     // private key (raw) takes precedence so both can be defined
                     // without issues
-                    if siwa.private_key.is_none() {
-                        if let Some(private_key_file) = siwa.private_key_file.take() {
-                            let key = tokio::fs::read_to_string(private_key_file).await?;
-                            siwa.private_key = Some(key);
-                        }
+                    if siwa.private_key.is_none()
+                        && let Some(private_key_file) = siwa.private_key_file.take()
+                    {
+                        let key = tokio::fs::read_to_string(private_key_file).await?;
+                        siwa.private_key = Some(key);
                     }
                     let encoded = serde_json::to_vec(&siwa)?;
                     Some(encrypter.encrypt_to_string(&encoded)?)

crates/config/src/sections/telemetry.rs

@@ -198,34 +198,34 @@ impl ConfigurationSection for TelemetryConfig {
         &self,
         _figment: &figment::Figment,
     ) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
-        if let Some(sample_rate) = self.sentry.sample_rate {
-            if !(0.0..=1.0).contains(&sample_rate) {
-                return Err(figment::error::Error::custom(
-                    "Sentry sample rate must be between 0.0 and 1.0",
-                )
-                .with_path("sentry.sample_rate")
-                .into());
-            }
+        if let Some(sample_rate) = self.sentry.sample_rate
+            && !(0.0..=1.0).contains(&sample_rate)
+        {
+            return Err(figment::error::Error::custom(
+                "Sentry sample rate must be between 0.0 and 1.0",
+            )
+            .with_path("sentry.sample_rate")
+            .into());
         }
 
-        if let Some(sample_rate) = self.sentry.traces_sample_rate {
-            if !(0.0..=1.0).contains(&sample_rate) {
-                return Err(figment::error::Error::custom(
-                    "Sentry sample rate must be between 0.0 and 1.0",
-                )
-                .with_path("sentry.traces_sample_rate")
-                .into());
-            }
+        if let Some(sample_rate) = self.sentry.traces_sample_rate
+            && !(0.0..=1.0).contains(&sample_rate)
+        {
+            return Err(figment::error::Error::custom(
+                "Sentry sample rate must be between 0.0 and 1.0",
+            )
+            .with_path("sentry.traces_sample_rate")
+            .into());
         }
 
-        if let Some(sample_rate) = self.tracing.sample_rate {
-            if !(0.0..=1.0).contains(&sample_rate) {
-                return Err(figment::error::Error::custom(
-                    "Tracing sample rate must be between 0.0 and 1.0",
-                )
-                .with_path("tracing.sample_rate")
-                .into());
-            }
+        if let Some(sample_rate) = self.tracing.sample_rate
+            && !(0.0..=1.0).contains(&sample_rate)
+        {
+            return Err(figment::error::Error::custom(
+                "Tracing sample rate must be between 0.0 and 1.0",
+            )
+            .with_path("tracing.sample_rate")
+            .into());
         }
 
         Ok(())

crates/context/src/fmt.rs

@@ -129,31 +129,31 @@ where
         field_fromatter.format_fields(writer.by_ref(), event)?;
 
         // If we have a OTEL span, we can add the trace ID to the end of the log line
-        if let Some(span) = ctx.lookup_current() {
-            if let Some(otel) = span.extensions().get::<OtelData>() {
-                let parent_cx_span = otel.parent_cx.span();
-                let sc = parent_cx_span.span_context();
-
-                // Check if the span is sampled, first from the span builder,
-                // then from the parent context if nothing is set there
-                if otel
-                    .builder
-                    .sampling_result
-                    .as_ref()
-                    .map_or(sc.is_sampled(), |r| {
-                        r.decision == SamplingDecision::RecordAndSample
-                    })
-                {
-                    // If it is the root span, the trace ID will be in the span builder. Else, it
-                    // will be in the parent OTEL context
-                    let trace_id = otel.builder.trace_id.unwrap_or(sc.trace_id());
-                    if trace_id != TraceId::INVALID {
-                        let label = Style::new()
-                            .italic()
-                            .force_styling(ansi)
-                            .apply_to("trace.id");
-                        write!(&mut writer, " {label}={trace_id}")?;
-                    }
+        if let Some(span) = ctx.lookup_current()
+            && let Some(otel) = span.extensions().get::<OtelData>()
+        {
+            let parent_cx_span = otel.parent_cx.span();
+            let sc = parent_cx_span.span_context();
+
+            // Check if the span is sampled, first from the span builder,
+            // then from the parent context if nothing is set there
+            if otel
+                .builder
+                .sampling_result
+                .as_ref()
+                .map_or(sc.is_sampled(), |r| {
+                    r.decision == SamplingDecision::RecordAndSample
+                })
+            {
+                // If it is the root span, the trace ID will be in the span builder. Else, it
+                // will be in the parent OTEL context
+                let trace_id = otel.builder.trace_id.unwrap_or(sc.trace_id());
+                if trace_id != TraceId::INVALID {
+                    let label = Style::new()
+                        .italic()
+                        .force_styling(ansi)
+                        .apply_to("trace.id");
+                    write!(&mut writer, " {label}={trace_id}")?;
                 }
             }
         }

crates/data-model/src/user_agent.rs

@@ -88,32 +88,31 @@ impl UserAgent {
 
     #[must_use]
     pub fn parse(user_agent: String) -> Self {
-        if !user_agent.contains("Mozilla/") {
-            if let Some((name, version, model, os, os_version)) =
+        if !user_agent.contains("Mozilla/")
+            && let Some((name, version, model, os, os_version)) =
                 UserAgent::parse_custom(&user_agent)
-            {
-                let mut device_type = DeviceType::Unknown;
-
-                // Handle mobile simple mobile devices
-                if os == "Android" || os == "iOS" {
-                    device_type = DeviceType::Mobile;
-                }
-
-                // Handle iPads
-                if model.contains("iPad") {
-                    device_type = DeviceType::Tablet;
-                }
-
-                return Self {
-                    name: Some(name.to_owned()),
-                    version: Some(version.to_owned()),
-                    os: Some(os.to_owned()),
-                    os_version: os_version.map(std::borrow::ToOwned::to_owned),
-                    model: Some(model.to_owned()),
-                    device_type,
-                    raw: user_agent,
-                };
+        {
+            let mut device_type = DeviceType::Unknown;
+
+            // Handle mobile simple mobile devices
+            if os == "Android" || os == "iOS" {
+                device_type = DeviceType::Mobile;
+            }
+
+            // Handle iPads
+            if model.contains("iPad") {
+                device_type = DeviceType::Tablet;
             }
+
+            return Self {
+                name: Some(name.to_owned()),
+                version: Some(version.to_owned()),
+                os: Some(os.to_owned()),
+                os_version: os_version.map(std::borrow::ToOwned::to_owned),
+                model: Some(model.to_owned()),
+                device_type,
+                raw: user_agent,
+            };
         }
 
         let mut model = None;
@@ -205,11 +204,11 @@ impl UserAgent {
         }
 
         // Special handling for Electron applications e.g. Element Desktop
-        if user_agent.contains("Electron/") {
-            if let Some(app) = UserAgent::parse_electron(&user_agent) {
-                result.name = app.0;
-                result.version = app.1;
-            }
+        if user_agent.contains("Electron/")
+            && let Some(app) = UserAgent::parse_electron(&user_agent)
+        {
+            result.name = app.0;
+            result.version = app.1;
         }
 
         Self {

crates/data-model/src/users.rs

@@ -223,17 +223,17 @@ impl UserRegistrationToken {
         }
 
         // Check if expired
-        if let Some(expires_at) = self.expires_at {
-            if now >= expires_at {
-                return false;
-            }
+        if let Some(expires_at) = self.expires_at
+            && now >= expires_at
+        {
+            return false;
         }
 
         // Check if usage limit exceeded
-        if let Some(usage_limit) = self.usage_limit {
-            if self.times_used >= usage_limit {
-                return false;
-            }
+        if let Some(usage_limit) = self.usage_limit
+            && self.times_used >= usage_limit
+        {
+            return false;
         }
 
         true

crates/handlers/src/admin/call_context.rs

@@ -187,10 +187,10 @@ where
         };
 
         // If there is a user for this session, check that it is not locked
-        if let Some(user) = &user {
-            if !user.is_valid() {
-                return Err(Rejection::UserLocked);
-            }
+        if let Some(user) = &user
+            && !user.is_valid()
+        {
+            return Err(Rejection::UserLocked);
         }
 
         if !session.is_valid() {

crates/handlers/src/lib.rs

@@ -475,13 +475,13 @@ fn recover_error(
 ) -> axum::response::Response {
     // Error responses should have an ErrorContext attached to them
     let ext = response.extensions().get::<ErrorContext>();
-    if let Some(ctx) = ext {
-        if let Ok(res) = templates.render_error(ctx) {
-            let (mut parts, _original_body) = response.into_parts();
-            parts.headers.remove(CONTENT_TYPE);
-            parts.headers.remove(CONTENT_LENGTH);
-            return (parts, Html(res)).into_response();
-        }
+    if let Some(ctx) = ext
+        && let Ok(res) = templates.render_error(ctx)
+    {
+        let (mut parts, _original_body) = response.into_parts();
+        parts.headers.remove(CONTENT_TYPE);
+        parts.headers.remove(CONTENT_LENGTH);
+        return (parts, Html(res)).into_response();
     }
 
     response