Auto merge of #9613 - danieleades:refactor/collapse-if-blocks, r=ehuss

collapse nested if blocks
rust-lang · Aug 6, 2021 · e928b62 · e928b62
2 parents 32b1ed1 + c5da878
commit e928b62
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 42 deletions.
diff --git a/src/cargo/core/compiler/context/mod.rs b/src/cargo/core/compiler/context/mod.rs
@@ -195,12 +195,12 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
                     self.compilation
                         .binaries
                         .push(self.unit_output(unit, bindst));
-                } else if unit.target.is_cdylib() {
-                    if !self.compilation.cdylibs.iter().any(|uo| uo.unit == *unit) {
-                        self.compilation
-                            .cdylibs
-                            .push(self.unit_output(unit, bindst));
-                    }
+                } else if unit.target.is_cdylib()
+                    && !self.compilation.cdylibs.iter().any(|uo| uo.unit == *unit)
+                {
+                    self.compilation
+                        .cdylibs
+                        .push(self.unit_output(unit, bindst));
                 }
             }
 

diff --git a/src/cargo/ops/cargo_config.rs b/src/cargo/ops/cargo_config.rs
@@ -51,13 +51,11 @@ pub struct GetOptions<'a> {
 }
 
 pub fn get(config: &Config, opts: &GetOptions<'_>) -> CargoResult<()> {
-    if opts.show_origin {
-        if !matches!(opts.format, ConfigFormat::Toml) {
-            bail!(
-                "the `{}` format does not support --show-origin, try the `toml` format instead",
-                opts.format
-            );
-        }
+    if opts.show_origin && !matches!(opts.format, ConfigFormat::Toml) {
+        bail!(
+            "the `{}` format does not support --show-origin, try the `toml` format instead",
+            opts.format
+        );
     }
     let key = match opts.key {
         Some(key) => ConfigKey::from_str(key),

diff --git a/src/cargo/ops/cargo_install.rs b/src/cargo/ops/cargo_install.rs
@@ -211,20 +211,18 @@ fn install_one(
                      specify an alternate source",
                         src.path().display()
                     );
+                } else if src.path().join("cargo.toml").exists() {
+                    bail!(
+                        "`{}` does not contain a Cargo.toml file, but found cargo.toml please try to rename it to Cargo.toml. \
+                 --path must point to a directory containing a Cargo.toml file.",
+                        src.path().display()
+                    )
                 } else {
-                    if src.path().join("cargo.toml").exists() {
-                        bail!(
-                            "`{}` does not contain a Cargo.toml file, but found cargo.toml please try to rename it to Cargo.toml. \
-                     --path must point to a directory containing a Cargo.toml file.",
-                            src.path().display()
-                        )
-                    } else {
-                        bail!(
-                            "`{}` does not contain a Cargo.toml file. \
-                     --path must point to a directory containing a Cargo.toml file.",
-                            src.path().display()
-                        )
-                    }
+                    bail!(
+                        "`{}` does not contain a Cargo.toml file. \
+                 --path must point to a directory containing a Cargo.toml file.",
+                        src.path().display()
+                    )
                 }
             }
             select_pkg(

diff --git a/src/cargo/sources/registry/index.rs b/src/cargo/sources/registry/index.rs
@@ -602,15 +602,13 @@ impl Summaries {
         // present and considered fresh this is where the debug assertions
         // actually happens to verify that our cache is indeed fresh and
         // computes exactly the same value as before.
-        if cfg!(debug_assertions) && cache_contents.is_some() {
-            if cache_bytes != cache_contents {
-                panic!(
-                    "original cache contents:\n{:?}\n\
-                     does not equal new cache contents:\n{:?}\n",
-                    cache_contents.as_ref().map(|s| String::from_utf8_lossy(s)),
-                    cache_bytes.as_ref().map(|s| String::from_utf8_lossy(s)),
-                );
-            }
+        if cfg!(debug_assertions) && cache_contents.is_some() && cache_bytes != cache_contents {
+            panic!(
+                "original cache contents:\n{:?}\n\
+                 does not equal new cache contents:\n{:?}\n",
+                cache_contents.as_ref().map(|s| String::from_utf8_lossy(s)),
+                cache_bytes.as_ref().map(|s| String::from_utf8_lossy(s)),
+            );
         }
 
         // Once we have our `cache_bytes` which represents the `Summaries` we're

diff --git a/src/cargo/util/config/target.rs b/src/cargo/util/config/target.rs
@@ -72,14 +72,12 @@ pub(super) fn get_target_applies_to_host(config: &Config) -> CargoResult<bool> {
         } else {
             Ok(!config.cli_unstable().host_config)
         }
+    } else if config.cli_unstable().host_config {
+        anyhow::bail!(
+            "the -Zhost-config flag requires the -Ztarget-applies-to-host flag to be set"
+        );
     } else {
-        if config.cli_unstable().host_config {
-            anyhow::bail!(
-                "the -Zhost-config flag requires the -Ztarget-applies-to-host flag to be set"
-            );
-        } else {
-            Ok(true)
-        }
+        Ok(true)
     }
 }