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

[beta] remove assert_matches #84759

Closed
wants to merge 4 commits into from
Closed

[beta] remove assert_matches #84759

wants to merge 4 commits into from

Conversation

Mark-Simulacrum
Copy link
Member

This reverts the assert_matches PR (#82770) on beta, to avoid #82913. It does not fix that issue, since it'll be a problem again in the next cycle (this PR targets beta only).

r? @m-ou-se

@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!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 30, 2021
m-ou-se
m-ou-se approved these changes Apr 30, 2021
View reviewed changes
Copy link
Member

@m-ou-se m-ou-se left a comment

Choose a reason for hiding this comment

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

Looks good to me. Only tiny downside is that those assert!()s will not display the Some(..) value if they very unexpectedly fail.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Copy link
Member Author

@bors r=m-ou-se rollup=never

@bors
Copy link
Contributor

bors commented Apr 30, 2021

📌 Commit c87547e has been approved by m-ou-se

@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 Apr 30, 2021
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Apr 30, 2021
Closed
@bors
Copy link
Contributor

bors commented May 1, 2021

⌛ Testing commit c87547e with merge 662d20af9b7e7f590e6b9811ce77637b3baee91b...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented May 1, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 1, 2021
@Mark-Simulacrum
Copy link
Member Author

@bors retry - we suspect this is #83262

@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 May 3, 2021
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request May 3, 2021
Merged
@Mark-Simulacrum
Copy link
Member Author

Closing in favor of #84864

@Mark-Simulacrum Mark-Simulacrum deleted the beta-next branch May 3, 2021 13:32
bors added a commit to rust-lang-ci/rust that referenced this pull request May 3, 2021
@bors
Auto merge of rust-lang#84864 - Mark-Simulacrum:stable-next, r=Mark-S…
88f19c6 
…imulacrum

[stable] 1.52.0 release

This includes the release notes (rust-lang#84183) as well as cherry-picked commits from:

* [beta] revert PR rust-lang#77885 rust-lang#84710
* [beta] remove assert_matches rust-lang#84759
* Revert PR 81473 to resolve (on beta) issues 81626 and 81658. rust-lang#83171
* [beta] rustdoc revert deref recur rust-lang#84868
*  Fix ICE of for-loop mut borrowck where no suggestions are available rust-lang#83401

Additionally in "fresh work" we're also:

* reverting: directly expose copy and copy_nonoverlapping intrinsics rust-lang#81238 to avoid rust-lang#84297 on 1.52
@pietroalbini pietroalbini mentioned this pull request May 4, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 5, 2021
@bors
Auto merge of rust-lang#84909 - pietroalbini:beta-next, r=Mark-Simula…
e58c811 
…crum

[beta] Prepare beta 1.53.0

Along with updating the channel and updating the bootstrap compiler, this also includes:

* 692454d - Fixes the diagnostics difference we had for some cycles already
* 9157430 - Disables the known broken RLS builder on AArch64 Windows
* rust-lang#84183 - Update RELEASES.md for 1.52.0
* rust-lang#84950 - Revert PR 83866
* rust-lang#84886 - Update RLS and Rustfmt

Changes we backported to 1.52.0 that we also need to include in 1.53.0 to avoid regressing:

* rust-lang#84867 - rustdoc: revert deref recur to resume inclusion of impl ExtTrait<Local> for ExtType
* rust-lang#84759 - [beta] remove assert_matches
* rust-lang#83171 - Revert PR 81473 to resolve (on beta) issues 81626 and 81658.

r? `@ghost`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@m-ou-se m-ou-se m-ou-se approved these changes

Assignees

@m-ou-se m-ou-se

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Mark-Simulacrum @rust-highfive @rust-log-analyzer @bors @m-ou-se