Minor style update.

rust-lang · Apr 27, 2018 · e82e9c1 · e82e9c1
1 parent 040f984
commit e82e9c1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 20 deletions.
diff --git a/src/cargo/core/package_id_spec.rs b/src/cargo/core/package_id_spec.rs
@@ -8,7 +8,7 @@ use core::PackageId;
 use util::{ToSemver, ToUrl};
 use util::errors::{CargoResult, CargoResultExt};
 
-/// Some or all of the data required to indentify a package:
+/// Some or all of the data required to identify a package:
 ///
 ///  1. the package name (a `String`, required)
 ///  2. the package version (a `Version`, optional)

diff --git a/src/cargo/core/profiles.rs b/src/cargo/core/profiles.rs
@@ -173,26 +173,31 @@ impl ProfileMaker {
     }
 
     fn validate_packages(&self, shell: &mut Shell, packages: &HashSet<&str>) -> CargoResult<()> {
-        if let Some(ref toml) = self.toml {
-            if let Some(ref overrides) = toml.overrides {
-                for key in overrides.keys().filter(|k| k.as_str() != "*") {
-                    if !packages.contains(key.as_str()) {
-                        let suggestion = packages
-                            .iter()
-                            .map(|p| (lev_distance(key, p), p))
-                            .filter(|&(d, _)| d < 4)
-                            .min_by_key(|p| p.0)
-                            .map(|p| p.1);
-                        match suggestion {
-                            Some(p) => shell.warn(format!(
-                                "package `{}` for profile override not found\n\nDid you mean `{}`?",
-                                key, p
-                            ))?,
-                            None => shell
-                                .warn(format!("package `{}` for profile override not found", key))?,
-                        };
+        let toml = match self.toml {
+            Some(ref toml) => toml,
+            None => return Ok(()),
+        };
+        let overrides = match toml.overrides {
+            Some(ref overrides) => overrides,
+            None => return Ok(()),
+        };
+        for key in overrides.keys().filter(|k| k.as_str() != "*") {
+            if !packages.contains(key.as_str()) {
+                let suggestion = packages
+                    .iter()
+                    .map(|p| (lev_distance(key, p), p))
+                    .filter(|&(d, _)| d < 4)
+                    .min_by_key(|p| p.0)
+                    .map(|p| p.1);
+                match suggestion {
+                    Some(p) => shell.warn(format!(
+                        "package `{}` for profile override not found\n\nDid you mean `{}`?",
+                        key, p
+                    ))?,
+                    None => {
+                        shell.warn(format!("package `{}` for profile override not found", key))?
                     }
-                }
+                };
             }
         }
         Ok(())