Skip to content

Commit 4209f95

Browse files
committed
Formatting
1 parent 389cb6f commit 4209f95

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

src/bootstrap/src/core/build_steps/gcc.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,8 @@ impl GccOutput {
4646
// If we build libgccjit ourselves, then `self.libgccjit` can actually be a symlink.
4747
// In that case, we have to resolve it first, otherwise we'd create a symlink to a symlink,
4848
// which wouldn't work.
49-
let actual_libgccjit_path = t!(
50-
path.canonicalize(),
51-
format!("Cannot find libgccjit at {}", path.display())
52-
);
49+
let actual_libgccjit_path =
50+
t!(path.canonicalize(), format!("Cannot find libgccjit at {}", path.display()));
5351

5452
let dst = directory.join(&target_filename);
5553
builder.copy_link(&actual_libgccjit_path, &dst, FileType::NativeLibrary);
@@ -61,7 +59,10 @@ impl GccOutput {
6159
let source = path.join(host_target);
6260
let dst = directory;
6361

64-
let targets = builder.config.targets.iter()
62+
let targets = builder
63+
.config
64+
.targets
65+
.iter()
6566
.map(|target| target.triple)
6667
.chain(std::iter::once(host_target));
6768

@@ -83,7 +84,6 @@ impl GccOutput {
8384
builder.copy_link(&actual_libgccjit_path, &dst, FileType::NativeLibrary);
8485
}
8586
}
86-
8787
}
8888
}
8989

src/bootstrap/src/core/build_steps/test.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3945,9 +3945,7 @@ impl Step for CodegenGCC {
39453945
.arg("--std-tests");
39463946

39473947
if let Some(ref path) = gcc.libgccjit {
3948-
cargo
3949-
.arg("--gcc-path")
3950-
.arg(path.parent().unwrap());
3948+
cargo.arg("--gcc-path").arg(path.parent().unwrap());
39513949
}
39523950
cargo.args(builder.config.test_args());
39533951

src/bootstrap/src/core/config/config.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,8 @@ impl Config {
621621
vendor: dist_vendor,
622622
} = toml.dist.unwrap_or_default();
623623

624-
let Gcc { download_ci_gcc: gcc_download_ci_gcc, libgccjit_libs_dir } = toml.gcc.unwrap_or_default();
624+
let Gcc { download_ci_gcc: gcc_download_ci_gcc, libgccjit_libs_dir } =
625+
toml.gcc.unwrap_or_default();
625626

626627
if rust_bootstrap_override_lld.is_some() && rust_bootstrap_override_lld_legacy.is_some() {
627628
panic!(

0 commit comments

Comments
 (0)