Skip to content

Commit a174d0e

Browse files
Fix tidy
1 parent 3831685 commit a174d0e

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/bootstrap/builder.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,8 +1284,8 @@ impl<'a> CargoCommand<'a> {
12841284
for filename in json["filenames"].as_array().unwrap() {
12851285
let filename = filename.as_str().unwrap();
12861286
// Skip files like executables
1287-
if !filename.ends_with(".rlib") && !filename.ends_with(".lib") && !is_dylib(&filename)
1288-
&& !(is_check && filename.ends_with(".rmeta"))
1287+
if !filename.ends_with(".rlib") && !filename.ends_with(".lib")
1288+
&& !is_dylib(&filename) && !(is_check && filename.ends_with(".rmeta"))
12891289
{
12901290
continue;
12911291
}
@@ -1354,7 +1354,9 @@ impl<'a> CargoCommand<'a> {
13541354
&& filename.ends_with(&extension[..]) && meta.len() == expected_len
13551355
});
13561356
let max = candidates
1357-
.max_by_key(|&&(_, _, ref metadata)| FileTime::from_last_modification_time(metadata));
1357+
.max_by_key(|&&(_, _, ref metadata)| {
1358+
FileTime::from_last_modification_time(metadata)
1359+
});
13581360
let path_to_add = match max {
13591361
Some(triple) => triple.0.to_str().unwrap(),
13601362
None => panic!("no output generated for {:?} {:?}", prefix, extension),

src/bootstrap/test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ impl Step for Rustfmt {
306306
compiler,
307307
target: self.host,
308308
});
309-
let mut cargo =
310-
tool::prepare_tool_cargo(builder, compiler, Mode::RustcTool, host, "test", "src/tools/rustfmt");
309+
let mut cargo = tool::prepare_tool_cargo(
310+
builder, compiler, Mode::RustcTool, host, "test", "src/tools/rustfmt");
311311

312312
// Don't build tests dynamically, just a pain to work with
313313
cargo.env("RUSTC_NO_PREFER_DYNAMIC", "1");

0 commit comments

Comments
 (0)