Skip to content

Commit 68240b2

Browse files
committed
Formatting
1 parent aeafb51 commit 68240b2

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

5553
let dest_dir = directory.join("rustlib").join(self.target).join("lib");
5654
t!(fs::create_dir_all(&dest_dir));
@@ -64,7 +62,10 @@ impl GccOutput {
6462
let source = path.join(host_target);
6563
let dst = directory;
6664

67-
let targets = builder.config.targets.iter()
65+
let targets = builder
66+
.config
67+
.targets
68+
.iter()
6869
.map(|target| target.triple)
6970
.chain(std::iter::once(host_target));
7071

@@ -86,7 +87,6 @@ impl GccOutput {
8687
builder.copy_link(&actual_libgccjit_path, &dst, FileType::NativeLibrary);
8788
}
8889
}
89-
9090
}
9191
}
9292

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

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

39683968
if let Some(ref path) = gcc.libgccjit {
3969-
cargo
3970-
.arg("--gcc-path")
3971-
.arg(path.parent().unwrap());
3969+
cargo.arg("--gcc-path").arg(path.parent().unwrap());
39723970
}
39733971
cargo.args(builder.config.test_args());
39743972

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)