Skip to content

Commit 4393731

Browse files
committed
Fix clippy lints
1 parent 65f9589 commit 4393731

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ impl Step for Gcc {
6464
return GccOutput { libgccjit: libgccjit_path };
6565
}
6666

67-
build_gcc(&metadata, &builder, target);
67+
build_gcc(&metadata, builder, target);
6868

6969
let lib_alias = metadata.install_dir.join("lib/libgccjit.so.0");
7070
if !lib_alias.exists() {
@@ -169,7 +169,7 @@ fn libgccjit_built_path(install_dir: &Path) -> PathBuf {
169169
fn build_gcc(metadata: &Meta, builder: &Builder<'_>, target: TargetSelection) {
170170
let Meta { stamp: _, out_dir, install_dir, root } = metadata;
171171

172-
t!(fs::create_dir_all(&out_dir));
172+
t!(fs::create_dir_all(out_dir));
173173

174174
// GCC creates files (e.g. symlinks to the downloaded dependencies)
175175
// in the source directory, which does not work with our CI setup, where we mount
@@ -182,7 +182,7 @@ fn build_gcc(metadata: &Meta, builder: &Builder<'_>, target: TargetSelection) {
182182
builder.remove_dir(&src_dir);
183183
}
184184
builder.create_dir(&src_dir);
185-
builder.cp_link_r(&root, &src_dir);
185+
builder.cp_link_r(root, &src_dir);
186186
src_dir
187187
} else {
188188
root.clone()
@@ -191,7 +191,7 @@ fn build_gcc(metadata: &Meta, builder: &Builder<'_>, target: TargetSelection) {
191191
command(src_dir.join("contrib/download_prerequisites")).current_dir(&src_dir).run(builder);
192192
let mut configure_cmd = command(src_dir.join("configure"));
193193
configure_cmd
194-
.current_dir(&out_dir)
194+
.current_dir(out_dir)
195195
// On CI, we compile GCC with Clang.
196196
// The -Wno-everything flag is needed to make GCC compile with Clang 19.
197197
// `-g -O2` are the default flags that are otherwise used by Make.
@@ -225,8 +225,8 @@ fn build_gcc(metadata: &Meta, builder: &Builder<'_>, target: TargetSelection) {
225225
}
226226
configure_cmd.run(builder);
227227

228-
command("make").current_dir(&out_dir).arg(format!("-j{}", builder.jobs())).run(builder);
229-
command("make").current_dir(&out_dir).arg("install").run(builder);
228+
command("make").current_dir(out_dir).arg(format!("-j{}", builder.jobs())).run(builder);
229+
command("make").current_dir(out_dir).arg("install").run(builder);
230230
}
231231

232232
/// Configures a Cargo invocation so that it can build the GCC codegen backend.

src/bootstrap/src/core/download.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ download-rustc = false
852852
";
853853
self.download_file(&format!("{base}/{gcc_sha}/{filename}"), &tarball, help_on_error);
854854
}
855-
self.unpack(&tarball, &root_dir, "gcc");
855+
self.unpack(&tarball, root_dir, "gcc");
856856
}
857857
}
858858

0 commit comments

Comments
 (0)