Skip to content

fix issue with x.py setup running into explicit panic#102557

Merged
bors merged 1 commit intorust-lang:masterfrom
junekept:master
Oct 2, 2022
Merged

fix issue with x.py setup running into explicit panic#102557
bors merged 1 commit intorust-lang:masterfrom
junekept:master

Conversation

@junekept
Copy link
Contributor

@junekept junekept commented Oct 1, 2022

Fixes problem with Issue #102555 causing x.py setup to fail. Simply requires rustfmt be downloaded a little later.

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Oct 1, 2022
@rust-highfive
Copy link
Contributor

rust-highfive commented Oct 1, 2022

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @jyn514 (or someone else) soon.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 1, 2022
jyn514
jyn514 reviewed Oct 1, 2022
View reviewed changes
@jyn514
Copy link
Member

jyn514 commented Oct 1, 2022

In retrospect, I'm not sure this will behave properly with --dry-run ... can you try rm -rf build and then x.py check --dry-run and see whether anything breaks? It's ok if rustfmt doesn't get downloaded, it just needs to not panic.

@jyn514 jyn514 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 Oct 1, 2022
@junekept
Copy link
Contributor Author

junekept commented Oct 1, 2022 •
edited
Loading

./x.py check --dry-run seems to run fine! Sorry for the accidental file, I forgot that I was halfway through setting up the toml file manually lol

@jyn514
Copy link
Member

jyn514 commented Oct 1, 2022

Thanks!

@bors r+ rollup p=10 (x.py fmt is broken for everyone)

@bors
Copy link
Collaborator

bors commented Oct 1, 2022

📌 Commit 8bba0de has been approved by jyn514

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 1, 2022
reez12g
reez12g reviewed Oct 1, 2022
View reviewed changes
Copy link
Contributor

@reez12g reez12g left a comment

Choose a reason for hiding this comment

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

I appreciate your fix!

@matthiaskrgr matthiaskrgr mentioned this pull request Oct 2, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 2, 2022
@bors
Auto merge of rust-lang#102558 - matthiaskrgr:rollup-0odec1c, r=matth…
ab37a83 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#102195 (Improve the COPYRIGHT file)
 - rust-lang#102313 (Update docs so that deprecated method points to relevant method)
 - rust-lang#102353 (Allow passing rustix_use_libc cfg using RUSTFLAGS)
 - rust-lang#102405 (Remove a FIXME whose code got moved away in rust-lang#62883.)
 - rust-lang#102525 (rustdoc: remove orphaned link on array bracket)
 - rust-lang#102557 (fix issue with x.py setup running into explicit panic)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Oct 2, 2022

⌛ Testing commit 8bba0de with merge ab37a83...

@bors bors merged commit c6d4421 into rust-lang:master Oct 2, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 2, 2022
@compiler-errors compiler-errors mentioned this pull request Oct 2, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@jyn514 jyn514 jyn514 left review comments

@reez12g reez12g reez12g left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@jyn514 jyn514

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.66.0

Development

Successfully merging this pull request may close these issues.

6 participants

@junekept @rust-highfive @jyn514 @bors @reez12g @rustbot