Skip to content

Rename the src install build step to rust-src. - #162423

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
davidv1992:install-rust-src
Sep 24, 2026
Merged

rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
davidv1992:install-rust-src

Conversation

@davidv1992

@davidv1992 davidv1992 commented Sep 7, 2026 •

Copy link
Copy Markdown
Contributor

View all comments

This avoids installing the src component from the command line also triggering installing a whole lot of other things which are behind the src path. Furthermore, it makes the name match the component as distributed in rustup, reducing confusion.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Sep 7, 2026
@rustbot

rustbot commented Sep 7, 2026

Copy link
Copy Markdown
Collaborator

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: bootstrap
  • bootstrap expanded to 6 candidates
  • Random selection from Mark-Simulacrum, clubby789, jieyouxu

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@Mark-Simulacrum Mark-Simulacrum left a comment •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also should be documented in the bootstrap changelog (https://github.com/rust-lang/rust/blob/20d35a3ae8f310f2a002e5f6e0bc583830010cd4/src/bootstrap/src/utils/change_tracker.rs). I don't think we support a good way to soft-deprecate so probably just changing this is OK? I'll mark @rustbot label +relnotes, so we can call it out as a compatibility note though.

View changes since this review


fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
run.path("src")
run.alias("rust-src")

@Mark-Simulacrum Mark-Simulacrum Sep 13, 2026 •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this will break

SKIP_SRC := --skip=src
-- can you fix that up? And look for some other cases of it.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed it, and fixed the remaining 4 occurrences I could find. I have taken the approach of everywhere src is used, it is intentional that rust-src is included, but given the size of the src directory, this may not always be the case, so if someone with more domain knowledge can take a look that would be great.

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 13, 2026
@rustbot

rustbot commented Sep 13, 2026

Copy link
Copy Markdown
Collaborator

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@rustbot

rustbot commented Sep 13, 2026

Copy link
Copy Markdown
Collaborator

Error: Unknown labels: a, as, call, can, compatibility, it, note, out, so, though, we

Please file an issue on GitHub at triagebot if there's a problem with this bot, or reach out on #triagebot on Zulip.

@Mark-Simulacrum Mark-Simulacrum added the relnotes Marks issues that should be documented in the release notes of the next release. label Sep 14, 2026
@rustbot

rustbot commented Sep 16, 2026

Copy link
Copy Markdown
Collaborator

Warning

If you are changing how CI LLVM is built or linked, make sure to bump
src/bootstrap/download-ci-llvm-stamp.

cc @jieyouxu

This PR modifies bootstrap.example.toml.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@rustbot rustbot added A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Sep 16, 2026
@davidv1992

Copy link
Copy Markdown
Contributor Author

Since rustbot added you into the conversation: @jieyouxu, there is technically a change to a default value in the bootstrap configuration, as rust-src is now its own thing rather than part of src. However, the default behavior of build.tools does not change, rust-src is built when extended=true in both the old and new situation. Should I still add an entry to CONFIG_CHANGE_HISTORY?

@davidv1992

Copy link
Copy Markdown
Contributor Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 16, 2026
@jieyouxu

jieyouxu commented Sep 16, 2026 •

Copy link
Copy Markdown
Member

I think that can't hurt, just in case. (Also that cc is actually for the CI changes not the bootstrap changes, but yeah anyway 😆)

@davidv1992

Copy link
Copy Markdown
Contributor Author

Ok, Added the entry as a warning.

@@ -324,12 +324,12 @@ impl CommandLineStep for Src {
const IS_HOST: bool = true;

fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
run.path("src")
run.alias("rust-src")

@jieyouxu jieyouxu Sep 16, 2026 •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @Kobzol as well, in case you know of an edge case for this alias.

EDIT: ah, but this is an install alias, which I am much less worried about (as opposed to build/dist aliases).

View changes since the review

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left some comments. I think that @Mark-Simulacrum's comment wasn't correct.

Comment thread bootstrap.example.toml Outdated
Comment thread src/bootstrap/src/utils/change_tracker.rs Outdated
Comment thread src/ci/github-actions/jobs.yml Outdated
Comment thread src/ci/github-actions/jobs.yml Outdated
Comment thread src/ci/docker/scripts/stage_2_test_set1.sh Outdated
Comment thread src/bootstrap/mk/Makefile.in Outdated
@rust-log-analyzer

This comment has been minimized.

@rust-bors

rust-bors Bot commented Sep 18, 2026

Copy link
Copy Markdown
Contributor

💔 Test for bc11f45 failed: CI. Failed job:

@rust-log-analyzer

This comment has been minimized.

@erickt

erickt commented Sep 18, 2026

Copy link
Copy Markdown
Contributor

This avoids installing the src component from the command line also
triggering a whole lot of other things which are behind the src path.
Furthermore, it makes the name match the component as distributed in
rustup, reducing confusion.
@rustbot

rustbot commented Sep 22, 2026

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@davidv1992

davidv1992 commented Sep 22, 2026 •

Copy link
Copy Markdown
Contributor Author

@erickt I have made the requested change. That was the only remaining issue right?

@rustbot ready

@jieyouxu jieyouxu removed their assignment Sep 22, 2026
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 22, 2026
@Kobzol

Kobzol commented Sep 23, 2026

Copy link
Copy Markdown
Member

@bors try jobs=test-x86_64-fuchsia

rust-bors Bot pushed a commit that referenced this pull request Sep 23, 2026
Rename the src install build step to rust-src.


try-job: test-x86_64-fuchsia
@rust-bors

This comment has been minimized.

@rust-bors rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 23, 2026
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
   Compiling ureq v3.4.0
   Compiling citool v0.1.0 (/home/runner/work/rust/rust/src/ci/citool)
    Finished `dev` profile [unoptimized] target(s) in 26.86s
     Running `target/debug/citool calculate-job-matrix`
Run type: TryJob { job_patterns: Some(["test-x86_64-fuchsia"]), nolimit: false }
Error: Failed to calculate job matrix

Caused by:
    Patterns `test-x86_64-fuchsia` did not match any auto jobs
##[error]Process completed with exit code 1.

@rust-bors

rust-bors Bot commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 093a0bb failed: CI. Failed job:

@jieyouxu

Copy link
Copy Markdown
Member

(We had to temporarily disable fuchsia again due to unauth server ratelimits)

@Kobzol

Kobzol commented Sep 23, 2026

Copy link
Copy Markdown
Member

Ah, right, I forgot. In that case I guess we can merge this first.

@bors r+

@rust-bors

rust-bors Bot commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

📌 Commit abcb978 has been approved by Kobzol

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 23, 2026
@rust-bors

This comment has been minimized.

@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 24, 2026
@rust-bors

rust-bors Bot commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: Kobzol
Duration: 3h 12m 26s
Pushing 3670d25 to main...

@rust-bors
rust-bors Bot merged commit 3670d25 into rust-lang:main Sep 24, 2026
14 of 15 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Sep 24, 2026
@github-actions

Copy link
Copy Markdown
Contributor
What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 6eeff9a (parent) -> 3670d25 (this PR)

Test differences

No test diffs found

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 3670d2532bdf51abbe0b8fea22284d7ca340ffe3 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. test-x86_64-gnu-gcc-core-tests: 18m 3s -> 7m 54s (-56.2%)
  2. dist-x86_64-msvc: 1h 56m -> 2h 56m (+52.0%)
  3. test-x86_64-gnu-aux: 1h 40m -> 2h 31m (+50.8%)
  4. test-x86_64-gnu-nopt: 1h 42m -> 2h 32m (+49.2%)
  5. test-i686-msvc: 1h 45m -> 2h 32m (+44.7%)
  6. test-i686-gnu-nopt-2: 1h 38m -> 2h 21m (+44.2%)
  7. dist-x86_64-mingw: 2h 50m -> 1h 38m (-42.2%)
  8. test-arm-android: 1h 53m -> 1h 6m (-40.8%)
  9. test-x86_64-gnu-llvm-21-3: 1h 17m -> 1h 49m (+40.5%)
  10. test-i686-gnu-2: 1h 8m -> 1h 35m (+39.9%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (3670d25): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

This perf run didn't have relevant results for this metric.

Cycles

Results (primary 2.5%, secondary 1.9%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
2.5% [2.2%, 2.8%] 2
Regressions ❌
(secondary)
1.9% [0.4%, 2.8%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.5% [2.2%, 2.8%] 2

Binary size

Results (primary 0.2%, secondary 0.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
0.2% [0.0%, 0.2%] 21
Regressions ❌
(secondary)
0.1% [0.0%, 0.2%] 37
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.2% [0.0%, 0.2%] 21

Bootstrap: 488.343s -> 488.345s (0.00%)
Artifact size: 406.24 MiB -> 406.38 MiB (0.03%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. relnotes Marks issues that should be documented in the release notes of the next release. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants