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.

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

rename assert_matches module #87195

Merged
merged 4 commits into from
Jul 17, 2021
Merged

Conversation

yaahc
Copy link
Member

@yaahc yaahc commented Jul 16, 2021

Fixes nightly breakage introduced in #86947

@rust-highfive
Copy link
Collaborator

Some changes occured to the CTFE / Miri engine

cc @rust-lang/miri

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 16, 2021
@yaahc yaahc added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Jul 16, 2021
@rust-log-analyzer

This comment has been minimized.

@oli-obk
Copy link
Contributor

oli-obk commented Jul 16, 2021

r=me with ui tests fixed

@Mark-Simulacrum
Copy link
Member

Unilaterally beta-nominating and accepting; this is presumably just as necessary as #87195 on beta.

@Mark-Simulacrum Mark-Simulacrum added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Jul 16, 2021
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@oli-obk
Copy link
Contributor

oli-obk commented Jul 16, 2021

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Jul 16, 2021

📌 Commit d0e8de6 has been approved by oli-obk

@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 Jul 16, 2021
@bors
Copy link
Contributor

bors commented Jul 17, 2021

⌛ Testing commit d0e8de6 with merge 0cd12d6...

@bors
Copy link
Contributor

bors commented Jul 17, 2021

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 0cd12d6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 17, 2021
@bors bors merged commit 0cd12d6 into rust-lang:master Jul 17, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 17, 2021
@richkadel
Copy link
Contributor

Thanks! This fixed #87189 and all of the compiler errors I was seeing.

@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 22, 2021
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.55.0, 1.54.0 Jul 22, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 22, 2021
…ulacrum

[beta] backports

Backports:

* Move assert_matches to an inner module rust-lang#86947
* rename assert_matches module rust-lang#87195
* Fix rust-analyzer install when not available. rust-lang#87007
@yaahc yaahc mentioned this pull request Jan 24, 2022
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants