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.

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

bootstrap: Get rid of tail_args in stream_cargo #106305

Merged
merged 3 commits into from
Dec 31, 2022
Merged

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Dec 30, 2022

Based on #106303 for convenience.

r? @Mark-Simulacrum

Previously, clean only supported `--stage 0` for specific crates.

The new `crate_description` function generates a string that looks
like
```
: {rustc_query_impl}
```
Before:
```
Testing ["rustc_interface"] stage0 (aarch64-unknown-linux-gnu -> aarch64-unknown-linux-gnu)
```

After:
```
Testing {rustc_interface} stage0 (aarch64-unknown-linux-gnu -> aarch64-unknown-linux-gnu)
```

Note there is a slight consistency between `build` and `test`: The
former doesn't print "compiler artifacts". It would be annoying to fix
and doesn't hurt anything, so I left it be.

```
; x t rustc_interface --stage 0 --dry-run
Testing {rustc_interface} stage0 (aarch64-unknown-linux-gnu -> aarch64-unknown-linux-gnu)
; x b rustc_interface --stage 0 --dry-run
Building {rustc_interface} stage0 compiler artifacts (aarch64-unknown-linux-gnu -> aarch64-unknown-linux-gnu)
```
@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 30, 2022
@Mark-Simulacrum
Copy link
Member

r=me

@jyn514
Copy link
Member Author

jyn514 commented Dec 30, 2022

@bors r=Mark-Simulacrum rollup

Note to anyone making rollups: this PR also includes #106271 and #106303.

@bors
Copy link
Contributor

bors commented Dec 30, 2022

📌 Commit 9dfe504 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors 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 Dec 30, 2022
jyn514 added a commit to jyn514/rust that referenced this pull request Dec 30, 2022
 bootstrap: Get rid of tail_args in stream_cargo

Based on rust-lang#106303 for convenience.

r? `@Mark-Simulacrum`
jyn514 added a commit to jyn514/rust that referenced this pull request Dec 31, 2022
 bootstrap: Get rid of tail_args in stream_cargo

Based on rust-lang#106303 for convenience.

r? ``@Mark-Simulacrum``
jyn514 added a commit to jyn514/rust that referenced this pull request Dec 31, 2022
 bootstrap: Get rid of tail_args in stream_cargo

Based on rust-lang#106303 for convenience.

r? ```@Mark-Simulacrum```
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 31, 2022
…mpiler-errors

Rollup of 9 pull requests

Successful merges:

 - rust-lang#105903 (Unify id-based thread parking implementations)
 - rust-lang#106232 (CFI: Monomorphize transparent ADTs before typeid)
 - rust-lang#106248 (Revert "Implement allow-by-default `multiple_supertrait_upcastable` lint")
 - rust-lang#106286 (Make tidy errors red)
 - rust-lang#106295 (Extend scraped examples layout GUI test for position of buttons)
 - rust-lang#106305 ( bootstrap: Get rid of tail_args in stream_cargo)
 - rust-lang#106310 (Dont use `--merge-base` during bootstrap formatting subcommand)
 - rust-lang#106314 (Fix panic on `x build --help`)
 - rust-lang#106317 (Only deduplicate stack traces for good path bugs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 93032e8 into rust-lang:master Dec 31, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 31, 2022
@jyn514 jyn514 deleted the tail-args branch January 2, 2023 23:37
JohnTitor pushed a commit to JohnTitor/rust that referenced this pull request Jan 9, 2023
Revert "bootstrap: Get rid of `tail_args` in `stream_cargo`"

This reverts commit 9dfe504. (Note: that merged as part of rust-lang#106305, but rust-lang#106305 contains more commits than just 9dfe504.)

Fixes `x clippy`. It turns out `clippy` was the only one using `tail_args` 🤦 sorry for not testing this earlier.

r? `@Mark-Simulacrum`
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.

4 participants