Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump stage0 to 1.80.0 #126273

Merged
merged 5 commits into from
Jun 12, 2024
Merged

Bump stage0 to 1.80.0 #126273

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
534b585
bump stage0 compiler
pietroalbini Jun 11, 2024
be9e27e
replace version placeholder
pietroalbini Jun 10, 2024
cd2ed56
remove cfg(bootstrap)
pietroalbini Jun 11, 2024
b595e19
cargo -Zcheck-cfg is now stable
pietroalbini Jun 11, 2024
48e614a
applease clippy
pietroalbini Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
applease clippy
  • Loading branch information
@pietroalbini
pietroalbini committed Jun 12, 2024
commit 48e614a84b1bfb9e35e8f48fcb0d572a8ac287a2
6 changes: 3 additions & 3 deletions src/bootstrap/src/core/build_steps/dist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
Expand Down Expand Up @@ -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())
}
}
Expand Down Expand Up @@ -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())
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/bootstrap/src/core/build_steps/doc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/build_steps/format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
6 changes: 3 additions & 3 deletions src/bootstrap/src/core/build_steps/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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");
}
Expand Down Expand Up @@ -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");
}
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/build_steps/tool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Loading