Skip to content

bootstrap: Flatten and rename compute_src_directory_via_git - #161644

Merged
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
Zalathar:compute-src
Aug 31, 2026
Merged

bootstrap: Flatten and rename compute_src_directory_via_git#161644
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
Zalathar:compute-src

Conversation

@Zalathar

@Zalathar Zalathar commented Aug 24, 2026

Copy link
Copy Markdown
Member

A small cleanup that I noticed while poking around the early parts of bootstrap.

The second commit (cfg!(test)) is another unrelated cleanup that I happened to notice nearby.


Because of indentation changes, viewing with “hide whitespace” is recommended.

There should be no change to bootstrap behaviour.

@rustbot

rustbot commented Aug 24, 2026

Copy link
Copy Markdown
Collaborator

This PR modifies src/bootstrap/src/core/config.

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

@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 Aug 24, 2026
@rustbot

rustbot commented Aug 24, 2026

Copy link
Copy Markdown
Collaborator

r? @clubby789

rustbot has assigned @clubby789.
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

@clubby789

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@rust-bors

rust-bors Bot commented Aug 30, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 7faee83 has been approved by clubby789

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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 30, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 30, 2026
bootstrap: Flatten and rename `compute_src_directory_via_git`

A small cleanup that I noticed while poking around the early parts of bootstrap.

The second commit (`cfg!(test)`) is another unrelated cleanup that I happened to notice nearby.

---

Because of indentation changes, viewing with “hide whitespace” is recommended.

There should be no change to bootstrap behaviour.
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 30, 2026
bootstrap: Flatten and rename `compute_src_directory_via_git`

A small cleanup that I noticed while poking around the early parts of bootstrap.

The second commit (`cfg!(test)`) is another unrelated cleanup that I happened to notice nearby.

---

Because of indentation changes, viewing with “hide whitespace” is recommended.

There should be no change to bootstrap behaviour.
rust-bors Bot pushed a commit that referenced this pull request Aug 30, 2026
…uwer

Rollup of 8 pull requests

Successful merges:

 - #137720 (support `#[target_feature(enable = ...)]` on `#[naked]` functions)
 - #160923 (Handle multiple action records in EH personality function)
 - #161788 (Check to ensure we're running against the correct LLVM version)
 - #161644 (bootstrap: Flatten and rename `compute_src_directory_via_git`)
 - #161702 (Use `drop_guard` in some places in {core,alloc,std})
 - #161931 (Revert "Add rustc_test_entrypoint_marker")
 - #162015 (touch up "get attribute" docs.)
 - #162019 (remove a couple of redundant clones, thanks clippy)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 30, 2026
bootstrap: Flatten and rename `compute_src_directory_via_git`

A small cleanup that I noticed while poking around the early parts of bootstrap.

The second commit (`cfg!(test)`) is another unrelated cleanup that I happened to notice nearby.

---

Because of indentation changes, viewing with “hide whitespace” is recommended.

There should be no change to bootstrap behaviour.
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 30, 2026
bootstrap: Flatten and rename `compute_src_directory_via_git`

A small cleanup that I noticed while poking around the early parts of bootstrap.

The second commit (`cfg!(test)`) is another unrelated cleanup that I happened to notice nearby.

---

Because of indentation changes, viewing with “hide whitespace” is recommended.

There should be no change to bootstrap behaviour.
rust-bors Bot pushed a commit that referenced this pull request Aug 30, 2026
…uwer

Rollup of 11 pull requests

Successful merges:

 - #160923 (Handle multiple action records in EH personality function)
 - #161788 (Check to ensure we're running against the correct LLVM version)
 - #158303 (Always escape grapheme extenders in `str::escape_debug`)
 - #161644 (bootstrap: Flatten and rename `compute_src_directory_via_git`)
 - #161702 (Use `drop_guard` in some places in {core,alloc,std})
 - #161713 (Add config for gram editor to .gitignore)
 - #161792 (Fix and improve diagnostics for lint `rust_2021_prefixes_incompatible_syntax`)
 - #161931 (Revert "Add rustc_test_entrypoint_marker")
 - #162015 (touch up "get attribute" docs.)
 - #162019 (remove a couple of redundant clones, thanks clippy)
 - #162023 (Remove redundant braces from `NonZero` doctests)
rust-bors Bot pushed a commit that referenced this pull request Aug 30, 2026
…uwer

Rollup of 11 pull requests

Successful merges:

 - #160923 (Handle multiple action records in EH personality function)
 - #161788 (Check to ensure we're running against the correct LLVM version)
 - #158303 (Always escape grapheme extenders in `str::escape_debug`)
 - #161644 (bootstrap: Flatten and rename `compute_src_directory_via_git`)
 - #161702 (Use `drop_guard` in some places in {core,alloc,std})
 - #161713 (Add config for gram editor to .gitignore)
 - #161792 (Fix and improve diagnostics for lint `rust_2021_prefixes_incompatible_syntax`)
 - #161931 (Revert "Add rustc_test_entrypoint_marker")
 - #162015 (touch up "get attribute" docs.)
 - #162019 (remove a couple of redundant clones, thanks clippy)
 - #162023 (Remove redundant braces from `NonZero` doctests)
@rust-bors
rust-bors Bot merged commit a2551d1 into rust-lang:main Aug 31, 2026
13 checks passed
@rustbot rustbot added this to the 1.100.0 milestone Aug 31, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 31, 2026
Rollup merge of #161644 - Zalathar:compute-src, r=clubby789

bootstrap: Flatten and rename `compute_src_directory_via_git`

A small cleanup that I noticed while poking around the early parts of bootstrap.

The second commit (`cfg!(test)`) is another unrelated cleanup that I happened to notice nearby.

---

Because of indentation changes, viewing with “hide whitespace” is recommended.

There should be no change to bootstrap behaviour.
@Zalathar
Zalathar deleted the compute-src branch August 31, 2026 01:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants