diff options
Diffstat (limited to 'xtask/src/tidy.rs')
-rw-r--r-- | xtask/src/tidy.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xtask/src/tidy.rs b/xtask/src/tidy.rs index 6f687a788..618cf12fb 100644 --- a/xtask/src/tidy.rs +++ b/xtask/src/tidy.rs | |||
@@ -33,7 +33,7 @@ fn check_code_formatting() { | |||
33 | let _e = pushenv("RUSTUP_TOOLCHAIN", "stable"); | 33 | let _e = pushenv("RUSTUP_TOOLCHAIN", "stable"); |
34 | crate::ensure_rustfmt().unwrap(); | 34 | crate::ensure_rustfmt().unwrap(); |
35 | let res = cmd!("cargo fmt -- --check").run(); | 35 | let res = cmd!("cargo fmt -- --check").run(); |
36 | if !res.is_ok() { | 36 | if res.is_err() { |
37 | let _ = cmd!("cargo fmt").run(); | 37 | let _ = cmd!("cargo fmt").run(); |
38 | } | 38 | } |
39 | res.unwrap() | 39 | res.unwrap() |
@@ -244,19 +244,19 @@ Zlib OR Apache-2.0 OR MIT | |||
244 | .map(|it| it.trim()) | 244 | .map(|it| it.trim()) |
245 | .map(|it| it[r#""license":"#.len()..].trim_matches('"')) | 245 | .map(|it| it[r#""license":"#.len()..].trim_matches('"')) |
246 | .collect::<Vec<_>>(); | 246 | .collect::<Vec<_>>(); |
247 | licenses.sort(); | 247 | licenses.sort_unstable(); |
248 | licenses.dedup(); | 248 | licenses.dedup(); |
249 | if licenses != expected { | 249 | if licenses != expected { |
250 | let mut diff = String::new(); | 250 | let mut diff = String::new(); |
251 | 251 | ||
252 | diff += &format!("New Licenses:\n"); | 252 | diff.push_str("New Licenses:\n"); |
253 | for &l in licenses.iter() { | 253 | for &l in licenses.iter() { |
254 | if !expected.contains(&l) { | 254 | if !expected.contains(&l) { |
255 | diff += &format!(" {}\n", l) | 255 | diff += &format!(" {}\n", l) |
256 | } | 256 | } |
257 | } | 257 | } |
258 | 258 | ||
259 | diff += &format!("\nMissing Licenses:\n"); | 259 | diff.push_str("\nMissing Licenses:\n"); |
260 | for &l in expected.iter() { | 260 | for &l in expected.iter() { |
261 | if !licenses.contains(&l) { | 261 | if !licenses.contains(&l) { |
262 | diff += &format!(" {}\n", l) | 262 | diff += &format!(" {}\n", l) |