Skip to content

Commit e82e9c1

Browse files
committed
Minor style update.
1 parent 040f984 commit e82e9c1

File tree

2 files changed

+25
-20
lines changed

2 files changed

+25
-20
lines changed

src/cargo/core/package_id_spec.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use core::PackageId;
88
use util::{ToSemver, ToUrl};
99
use util::errors::{CargoResult, CargoResultExt};
1010

11-
/// Some or all of the data required to indentify a package:
11+
/// Some or all of the data required to identify a package:
1212
///
1313
/// 1. the package name (a `String`, required)
1414
/// 2. the package version (a `Version`, optional)

src/cargo/core/profiles.rs

+24-19
Original file line numberDiff line numberDiff line change
@@ -173,26 +173,31 @@ impl ProfileMaker {
173173
}
174174

175175
fn validate_packages(&self, shell: &mut Shell, packages: &HashSet<&str>) -> CargoResult<()> {
176-
if let Some(ref toml) = self.toml {
177-
if let Some(ref overrides) = toml.overrides {
178-
for key in overrides.keys().filter(|k| k.as_str() != "*") {
179-
if !packages.contains(key.as_str()) {
180-
let suggestion = packages
181-
.iter()
182-
.map(|p| (lev_distance(key, p), p))
183-
.filter(|&(d, _)| d < 4)
184-
.min_by_key(|p| p.0)
185-
.map(|p| p.1);
186-
match suggestion {
187-
Some(p) => shell.warn(format!(
188-
"package `{}` for profile override not found\n\nDid you mean `{}`?",
189-
key, p
190-
))?,
191-
None => shell
192-
.warn(format!("package `{}` for profile override not found", key))?,
193-
};
176+
let toml = match self.toml {
177+
Some(ref toml) => toml,
178+
None => return Ok(()),
179+
};
180+
let overrides = match toml.overrides {
181+
Some(ref overrides) => overrides,
182+
None => return Ok(()),
183+
};
184+
for key in overrides.keys().filter(|k| k.as_str() != "*") {
185+
if !packages.contains(key.as_str()) {
186+
let suggestion = packages
187+
.iter()
188+
.map(|p| (lev_distance(key, p), p))
189+
.filter(|&(d, _)| d < 4)
190+
.min_by_key(|p| p.0)
191+
.map(|p| p.1);
192+
match suggestion {
193+
Some(p) => shell.warn(format!(
194+
"package `{}` for profile override not found\n\nDid you mean `{}`?",
195+
key, p
196+
))?,
197+
None => {
198+
shell.warn(format!("package `{}` for profile override not found", key))?
194199
}
195-
}
200+
};
196201
}
197202
}
198203
Ok(())

0 commit comments

Comments
 (0)