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

Revert let_chains stabilization #100538

Merged
merged 1 commit into from
Aug 18, 2022
Merged

Revert let_chains stabilization #100538

merged 1 commit into from
Aug 18, 2022

Conversation

Noratrieb
Copy link
Member

@Noratrieb Noratrieb commented Aug 14, 2022 •
edited
Loading

This reverts commit 3266460.

It was discovered in #100513 that they are not implemented correctly, which does not make them ready for stabilization.

The merge in the let parsing had a few conflicts, cc @compiler-errors and @c410-f3r to make sure I did it correctly (alternatively I could also revert @compiler-errors' let diagnostic improvement PR as well if a simpler revert is desired).

r? @Mark-Simulacrum

@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Aug 14, 2022
@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rustbot
Copy link
Collaborator

rustbot commented Aug 14, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 14, 2022
@Mark-Simulacrum
Copy link
Member

r? @compiler-errors

@compiler-errors
Copy link
Member

Discussed with nils on zulip, this looks fine.

@bors r+ rollup=never p=1

@bors
Copy link
Contributor

bors commented Aug 14, 2022

📌 Commit ef569fef7e3ce8094c56ad98d56bc2149d0630ff has been approved by compiler-errors

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 Aug 14, 2022
@Noratrieb
Copy link
Member Author

Looking at CI, this doesn't look fine to me :)
Or is this normal that is failing for beta?

@compiler-errors
Copy link
Member

@bors r-

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 14, 2022
@compiler-errors
Copy link
Member

Yeah, that's broken I think 🤔

@Noratrieb
Copy link
Member Author

The feature(let_chains) attribute in rustc_errors got an incorrect cfg_attr(bootstrap). I added it unconditionally and didn't see any other wrong features, so it should hopefully pass CI now.

@compiler-errors
Copy link
Member

@bors delegate=nilstrieb

r=me when CI is green then

@bors
Copy link
Contributor

bors commented Aug 14, 2022

✌️ @Nilstrieb can now approve this pull request

@Noratrieb
Copy link
Member Author

Noratrieb commented Aug 14, 2022 •
edited
Loading

i think i messed up my rebase, at least git printed a warning while trying to rebase something else on another branch :/

@Noratrieb
Copy link
Member Author

I did the entire revert again (copying out the conflict merge results from the PR here), could you take a quick look anyways to make sure I didn't break it? @compiler-errors

@compiler-errors
Copy link
Member

The force-push diff looks right: https://github.com/rust-lang/rust/compare/b1f53f864deb49b078cabe6f6ae372bea7c99ad4..4b77950bac03717796b98df65b45bd9fee44a3d5

@Noratrieb
Copy link
Member Author

Oh no, it does not, the cfg_attr got in again 😢

@compiler-errors
Copy link
Member

🤣

@wesleywiser wesleywiser added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 15, 2022
wesleywiser
wesleywiser approved these changes Aug 15, 2022
View reviewed changes
Copy link
Member

@wesleywiser wesleywiser left a comment

Choose a reason for hiding this comment

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

Revert looks good to me but I think we should wait for the compiler team triage meeting on Thursday before merging.

@joshtriplett
Copy link
Member

LGTM

@Kobzol Kobzol mentioned this pull request Aug 17, 2022
Closed
@c410-f3r c410-f3r mentioned this pull request Aug 17, 2022
Open
14 tasks
@m-ou-se m-ou-se removed the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Aug 17, 2022
@pnkfelix
Copy link
Member

discussed at T-compiler meeting.

@rustbot label: beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Aug 18, 2022
@compiler-errors
Copy link
Member

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Aug 18, 2022

📌 Commit 11a367a has been approved by compiler-errors

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 Aug 18, 2022
@bors
Copy link
Contributor

bors commented Aug 18, 2022

⌛ Testing commit 11a367a with merge 82bf341...

@bors
Copy link
Contributor

bors commented Aug 18, 2022

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 82bf341 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 18, 2022
@bors bors merged commit 82bf341 into rust-lang:beta Aug 18, 2022
@rustbot rustbot added this to the 1.64.0 milestone Aug 18, 2022
@Noratrieb Noratrieb deleted the revert-let-chains-beta branch August 18, 2022 21:18
@WiSaGaN WiSaGaN mentioned this pull request Aug 19, 2022
Merged
@Noratrieb Noratrieb mentioned this pull request Aug 20, 2022
Merged
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 28, 2022
Noratrieb added a commit to Noratrieb/rust that referenced this pull request Aug 29, 2022
@Noratrieb
Revert let_chains stabilization
d1ef818 
This reverts commit 3266460.

This is the revert against master, the beta revert was already done in rust-lang#100538.
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 30, 2022
@bors
Auto merge of rust-lang#100812 - Nilstrieb:revert-let-chains-nightly,…
a0d0709 
… r=Mark-Simulacrum

Revert let_chains stabilization

This is the revert against master, the beta revert was already done in rust-lang#100538.

Bumps the stage0 compiler which already has it reverted.
flip1995 pushed a commit to flip1995/rust that referenced this pull request Sep 9, 2022
@Noratrieb
Revert let_chains stabilization
ce847be 
This reverts commit 3266460.

This is the revert against master, the beta revert was already done in rust-lang#100538.
@jorendorff jorendorff mentioned this pull request Sep 19, 2022
Merged
@svblsvljb svblsvljb mentioned this pull request Oct 7, 2022
Closed
@jxs jxs mentioned this pull request Dec 8, 2022
Merged
4 tasks
@est31 est31 mentioned this pull request Nov 10, 2024
Open
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@c410-f3r c410-f3r c410-f3r approved these changes

@wesleywiser wesleywiser wesleywiser approved these changes

Assignees

@compiler-errors compiler-errors

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.64.0
Development

Successfully merging this pull request may close these issues.