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

Jump to bottom

Fix x fix on the standard library itself #107626

Merged
merged 1 commit into from
Feb 15, 2023
Merged

Fix x fix on the standard library itself #107626

merged 1 commit into from
Feb 15, 2023

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Feb 3, 2023

Fixes #107501

@rustbot
Copy link
Collaborator

rustbot commented Feb 3, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@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 Feb 3, 2023
jyn514
jyn514 commented Feb 3, 2023
View reviewed changes
src/bootstrap/check.rs
@@ -99,6 +99,10 @@ impl Step for Std {
cargo_subcommand(builder.kind),
);
std_cargo(builder, target, compiler.stage, &mut cargo);
if matches!(builder.config.cmd, Subcommand::Fix { .. }) {
// By default, cargo tries to fix all targets. Tell it not to fix tests until we've added `test` to the sysroot.
cargo.arg("--lib");
Copy link
Member Author

Choose a reason for hiding this comment

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

This will still run it on tests eventually when we run cargo a second time below, in "Checking test/bench/example targets".

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Feb 12, 2023

📌 Commit 9be0b3e 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 Feb 12, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 14, 2023
@matthiaskrgr
Rollup merge of rust-lang#107626 - jyn514:x-fix, r=Mark-Simulacrum
589bcdc 
Fix `x fix` on the standard library itself

Fixes rust-lang#107501
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 14, 2023
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 14, 2023
@matthiaskrgr
Rollup merge of rust-lang#107626 - jyn514:x-fix, r=Mark-Simulacrum
42bd543 
Fix `x fix` on the standard library itself

Fixes rust-lang#107501
This was referenced Feb 14, 2023
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 14, 2023
@bors
Auto merge of rust-lang#108056 - matthiaskrgr:rollup-oa6bxvh, r=matth…
0416b1a 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#107573 (Update the minimum external LLVM to 14)
 - rust-lang#107626 (Fix `x fix` on the standard library itself)
 - rust-lang#107673 (update ICU4X to 1.1.0)
 - rust-lang#107733 (Store metrics from `metrics.json` to CI PGO timer)
 - rust-lang#108007 (Use `is_str` instead of string kind comparison)
 - rust-lang#108033 (add an unstable `#[rustc_coinductive]` attribute)
 - rust-lang#108039 (Refactor refcounted structural_impls via functors)
 - rust-lang#108040 (Use derive attributes for uninteresting traversals)
 - rust-lang#108044 (interpret: rename Pointer::from_addr → from_addr_invalid)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2c1d3e9 into rust-lang:master Feb 15, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 15, 2023
@jyn514 jyn514 deleted the x-fix branch February 25, 2023 18:32
Jarcho pushed a commit to Jarcho/rust that referenced this pull request Feb 26, 2023
@bors
Auto merge of rust-lang#108056 - matthiaskrgr:rollup-oa6bxvh, r=matth…
5a8b288 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#107573 (Update the minimum external LLVM to 14)
 - rust-lang#107626 (Fix `x fix` on the standard library itself)
 - rust-lang#107673 (update ICU4X to 1.1.0)
 - rust-lang#107733 (Store metrics from `metrics.json` to CI PGO timer)
 - rust-lang#108007 (Use `is_str` instead of string kind comparison)
 - rust-lang#108033 (add an unstable `#[rustc_coinductive]` attribute)
 - rust-lang#108039 (Refactor refcounted structural_impls via functors)
 - rust-lang#108040 (Use derive attributes for uninteresting traversals)
 - rust-lang#108044 (interpret: rename Pointer::from_addr → from_addr_invalid)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

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
Milestone
1.69.0
Development

Successfully merging this pull request may close these issues.

x.py fix is broken
4 participants
@jyn514 @rustbot @Mark-Simulacrum @bors