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

Bootstrap compiler update #92887

Merged
merged 2 commits into from
Jan 30, 2022
Merged

Bootstrap compiler update #92887

merged 2 commits into from
Jan 30, 2022

Conversation

pietroalbini
Copy link
Member

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 14, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 14, 2022
@pietroalbini pietroalbini added T-release Relevant to the release subteam, which will review and decide on the PR/issue. and removed T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 14, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Copy link
Member

@pietroalbini Are you expecting to fix the CI failures here? At minimum it looks like this needs to adjust https://github.com/rust-lang/rust/blob/master/src/bootstrap/builder.rs#L991 as well, though I doubt that's the cause of the CI errors.

@Mark-Simulacrum Mark-Simulacrum 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 Jan 17, 2022
@pietroalbini
Copy link
Member Author

I'll probably get to it on Friday, if you can do it earlier feel free to!

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 21, 2022
@pietroalbini
Copy link
Member Author

Updated to the latest beta (with CVE-2222-21658 fixed) and removed a few cfgs I missed.

The errors are still there though, which I believe are caused by:

error: duplicate lang item in crate `core` (which `unwind` depends on): `bool`.
  |
  = note: the lang item is first defined in crate `core` (which `std` depends on)
  = note: first definition in `core` loaded from /home/pietro/r/github/rust-lang/rust/build/x86_64-unknown-linux-gnu/stage0-std/i686-pc-windows-gnu/release/deps/libcore-184c1e537d02255b.rmeta
  = note: second definition in `core` loaded from /home/pietro/r/github/rust-lang/rust/build/x86_64-unknown-linux-gnu/stage0-std/i686-pc-windows-gnu/release/deps/libcore-3bbea6e36a06d9e2.rmeta

Still, I can't figure out why they're happening :(

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@ehuss
Copy link
Contributor

ehuss commented Jan 25, 2022

For the record, this is blocked on rust-lang/cargo#10324 and the subsequent backport.

@ehuss
Copy link
Contributor

ehuss commented Jan 26, 2022

#93306 landed, so he fix should be in the next beta (tonight?). Let me know if you run into any other problems.

@pietroalbini pietroalbini 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 Jan 28, 2022
@pietroalbini
Copy link
Member Author

@Mark-Simulacrum ok this is ready for review, the Cargo issue seems to be fixed.

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Jan 28, 2022

📌 Commit 5b3462c has been approved by Mark-Simulacrum

@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 Jan 28, 2022
@ehuss ehuss mentioned this pull request Jan 30, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 30, 2022
@bors
Auto merge of rust-lang#93482 - ehuss:rollup-qjyppci, r=ehuss
8c7f2bf 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#92887 (Bootstrap compiler update)
 - rust-lang#92908 (Render more readable macro matcher tokens in rustdoc)
 - rust-lang#93183 (rustdoc: mobile nav fixes)
 - rust-lang#93192 (Add VS 2022 into error message)
 - rust-lang#93475 (Add test to ensure that theme is applied correctly when going back in history)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0610d4f into rust-lang:master Jan 30, 2022
@rustbot rustbot added this to the 1.60.0 milestone Jan 30, 2022
@pietroalbini pietroalbini deleted the pa-bootstrap-update branch February 20, 2022 22:50
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-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.60.0
Development

Successfully merging this pull request may close these issues.
7 participants
@pietroalbini @rust-log-analyzer @Mark-Simulacrum @ehuss @bors @rust-highfive @rustbot