bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

applease clippy

Browse source
This commit is contained in:
Pietro Albini 2024-06-12 12:15:52 +02:00
parent b595e1977a
commit 48e614a84b
No known key found for this signature in database
GPG key ID: CD76B35F7734769E
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/bootstrap/src/core/build_steps/dist.rs
View file

@ -78,7 +78,7 @@ impl Step for Docs {
let mut tarball = Tarball::new(builder, "rust-docs", &host.triple);
tarball.set_product_name("Rust Documentation");
tarball.add_bulk_dir(&builder.doc_out(host), dest);
tarball.add_bulk_dir(builder.doc_out(host), dest);
tarball.add_file(builder.src.join("src/doc/robots.txt"), dest, 0o644);
Some(tarball.generate())
}
@ -117,7 +117,7 @@ impl Step for JsonDocs {
let mut tarball = Tarball::new(builder, "rust-docs-json", &host.triple);
tarball.set_product_name("Rust Documentation In JSON Format");
tarball.is_preview(true);
tarball.add_bulk_dir(&builder.json_doc_out(host), dest);
tarball.add_bulk_dir(builder.json_doc_out(host), dest);
Some(tarball.generate())
}
}
@ -148,7 +148,7 @@ impl Step for RustcDocs {
let mut tarball = Tarball::new(builder, "rustc-docs", &host.triple);
tarball.set_product_name("Rustc Documentation");
tarball.add_bulk_dir(&builder.compiler_doc_out(host), "share/doc/rust/html/rustc");
tarball.add_bulk_dir(builder.compiler_doc_out(host), "share/doc/rust/html/rustc");
Some(tarball.generate())
}
}

4
src/bootstrap/src/core/build_steps/doc.rs
View file

@ -378,7 +378,7 @@ impl Step for Standalone {
.arg(&favicon)
.arg("--markdown-no-toc")
.arg("--index-page")
.arg(&builder.src.join("src/doc/index.md"))
.arg(builder.src.join("src/doc/index.md"))
.arg("--markdown-playground-url")
.arg("https://play.rust-lang.org/")
.arg("-o")
@ -482,7 +482,7 @@ impl Step for Releases {
.arg("--markdown-css")
.arg("rust.css")
.arg("--index-page")
.arg(&builder.src.join("src/doc/index.md"))
.arg(builder.src.join("src/doc/index.md"))
.arg("--markdown-playground-url")
.arg("https://play.rust-lang.org/")
.arg("-o")

2
src/bootstrap/src/core/build_steps/format.rs
View file

@ -15,7 +15,7 @@ fn rustfmt(src: &Path, rustfmt: &Path, paths: &[PathBuf], check: bool) -> impl F
let mut cmd = Command::new(rustfmt);
// Avoid the submodule config paths from coming into play. We only allow a single global config
// for the workspace for now.
cmd.arg("--config-path").arg(&src.canonicalize().unwrap());
cmd.arg("--config-path").arg(src.canonicalize().unwrap());
cmd.arg("--edition").arg("2021");
cmd.arg("--unstable-features");
cmd.arg("--skip-children");

6
src/bootstrap/src/core/build_steps/test.rs
View file

@ -308,7 +308,7 @@ impl Step for Cargo {
// Forcibly disable tests using nightly features since any changes to
// those features won't be able to land.
cargo.env("CARGO_TEST_DISABLE_NIGHTLY", "1");
cargo.env("PATH", &path_for_cargo(builder, compiler));
cargo.env("PATH", path_for_cargo(builder, compiler));
#[cfg(feature = "build-metrics")]
builder.metrics.begin_test_suite(
@ -2559,7 +2559,7 @@ fn prepare_cargo_test(
cargo.arg("-p").arg(krate);
}
cargo.arg("--").args(&builder.config.test_args()).args(libtest_args);
cargo.arg("--").args(builder.config.test_args()).args(libtest_args);
if !builder.config.verbose_tests {
cargo.arg("--quiet");
}
@ -3108,7 +3108,7 @@ impl Step for TierCheck {
&[],
);
cargo.arg(builder.src.join("src/doc/rustc/src/platform-support.md"));
cargo.arg(&builder.rustc(self.compiler));
cargo.arg(builder.rustc(self.compiler));
if builder.is_verbose() {
cargo.arg("--verbose");
}

2
src/bootstrap/src/core/build_steps/tool.rs
View file

@ -199,7 +199,7 @@ pub fn prepare_tool_cargo(
cargo.env("CFG_COMMIT_DATE", date);
}
if !features.is_empty() {
cargo.arg("--features").arg(&features.join(", "));
cargo.arg("--features").arg(features.join(", "));
}
// Enable internal lints for clippy and rustdoc

2
src/bootstrap/src/lib.rs
View file

@ -624,7 +624,7 @@ impl Build {
self.config
.git()
.args(["config", "--file"])
.arg(&self.config.src.join(".gitmodules"))
.arg(self.config.src.join(".gitmodules"))
.args(["--get-regexp", "path"]),
);
for line in output.lines() {