Skip to content

Commit 2051784

Browse files
committed
Formatting
1 parent 6287804 commit 2051784

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
@@ -51,10 +51,8 @@ impl GccOutput {
5151
// If we build libgccjit ourselves, then `self.libgccjit` can actually be a symlink.
5252
// In that case, we have to resolve it first, otherwise we'd create a symlink to a symlink,
5353
// which wouldn't work.
54-
let actual_libgccjit_path = t!(
55-
path.canonicalize(),
56-
format!("Cannot find libgccjit at {}", path.display())
57-
);
54+
let actual_libgccjit_path =
55+
t!(path.canonicalize(), format!("Cannot find libgccjit at {}", path.display()));
5856

5957
let dst = directory.join(&target_filename);
6058
builder.copy_link(&actual_libgccjit_path, &dst, FileType::NativeLibrary);
@@ -66,7 +64,10 @@ impl GccOutput {
6664
let source = path.join(host_target);
6765
let dst = directory;
6866

69-
let targets = builder.config.targets.iter()
67+
let targets = builder
68+
.config
69+
.targets
70+
.iter()
7071
.map(|target| target.triple)
7172
.chain(std::iter::once(host_target));
7273

@@ -88,7 +89,6 @@ impl GccOutput {
8889
builder.copy_link(&actual_libgccjit_path, &dst, FileType::NativeLibrary);
8990
}
9091
}
91-
9292
}
9393
}
9494

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

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

38793879
if let Some(ref path) = gcc.libgccjit {
3880-
cargo
3881-
.arg("--gcc-path")
3882-
.arg(path.parent().unwrap());
3880+
cargo.arg("--gcc-path").arg(path.parent().unwrap());
38833881
}
38843882
cargo.args(builder.config.test_args());
38853883

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)