Skip to content

Commit 3366327

Browse files
committed
Change paths for dist command to match the components they generate
Before, you could have the confusing situation where the command to generate a component had no relation to the name of that component (e.g. the `rustc` component was generated with `src/librustc`). This changes the name to make them match up.
1 parent 82af160 commit 3366327

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/bootstrap/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
1010
- `llvm-libunwind` now accepts `in-tree` (formerly true), `system` or `no` (formerly false) [#77703](https://github.com/rust-lang/rust/pull/77703)
1111
- The options `infodir`, `localstatedir`, and `gpg-password-file` are no longer allowed in config.toml. Previously, they were ignored without warning. Note that `infodir` and `localstatedir` are still accepted by `./configure`, with a warning. [#82451](https://github.com/rust-lang/rust/pull/82451)
1212
- Add options for enabling overflow checks, one for std (`overflow-checks-std`) and one for everything else (`overflow-checks`). Both default to false.
13+
- Change the names for `dist` commmands to match the component they generate. [#90684](https://github.com/rust-lang/rust/pull/90684)
1314

1415
### Non-breaking changes
1516

src/bootstrap/dist.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ impl Step for Docs {
6464

6565
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
6666
let default = run.builder.config.docs;
67-
run.path("src/doc").default_condition(default)
67+
run.path("rust-docs").default_condition(default)
6868
}
6969

7070
fn make_run(run: RunConfig<'_>) {
@@ -275,7 +275,7 @@ impl Step for Mingw {
275275
const DEFAULT: bool = true;
276276

277277
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
278-
run.never()
278+
run.path("rust-mingw")
279279
}
280280

281281
fn make_run(run: RunConfig<'_>) {
@@ -316,7 +316,7 @@ impl Step for Rustc {
316316
const ONLY_HOSTS: bool = true;
317317

318318
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
319-
run.path("src/librustc")
319+
run.path("rustc")
320320
}
321321

322322
fn make_run(run: RunConfig<'_>) {
@@ -572,7 +572,7 @@ impl Step for Std {
572572
const DEFAULT: bool = true;
573573

574574
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
575-
run.path("library/std")
575+
run.path("rust-std")
576576
}
577577

578578
fn make_run(run: RunConfig<'_>) {
@@ -686,7 +686,7 @@ impl Step for Analysis {
686686

687687
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
688688
let default = should_build_extended_tool(&run.builder, "analysis");
689-
run.path("analysis").default_condition(default)
689+
run.path("rust-analysis").default_condition(default)
690690
}
691691

692692
fn make_run(run: RunConfig<'_>) {
@@ -821,7 +821,7 @@ impl Step for Src {
821821
const ONLY_HOSTS: bool = true;
822822

823823
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
824-
run.path("src")
824+
run.path("rust-src")
825825
}
826826

827827
fn make_run(run: RunConfig<'_>) {
@@ -874,7 +874,7 @@ impl Step for PlainSourceTarball {
874874

875875
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
876876
let builder = run.builder;
877-
run.path("src").default_condition(builder.config.rust_dist_src)
877+
run.path("rustc-src").default_condition(builder.config.rust_dist_src)
878878
}
879879

880880
fn make_run(run: RunConfig<'_>) {
@@ -2120,7 +2120,7 @@ impl Step for BuildManifest {
21202120
const ONLY_HOSTS: bool = true;
21212121

21222122
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
2123-
run.path("src/tools/build-manifest")
2123+
run.path("build-manifest")
21242124
}
21252125

21262126
fn make_run(run: RunConfig<'_>) {
@@ -2152,7 +2152,7 @@ impl Step for ReproducibleArtifacts {
21522152
const ONLY_HOSTS: bool = true;
21532153

21542154
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
2155-
run.path("reproducible")
2155+
run.path("reproducible-artifacts")
21562156
}
21572157

21582158
fn make_run(run: RunConfig<'_>) {

0 commit comments

Comments
 (0)