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

Remove unwrap_or! macro #89672

Merged
merged 1 commit into from
Oct 9, 2021
Merged

Remove unwrap_or! macro #89672

merged 1 commit into from
Oct 9, 2021

Conversation

klensy
Copy link
Contributor

@klensy klensy commented Oct 8, 2021

Removes unwrap_or! macro and replaces it with match.

It's kinda cleanup, as rustc_ast not the best place for this macro and this is used only in 2 places anyway.

@rust-highfive
Copy link
Contributor

r? @jackh726

(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 Oct 8, 2021
@jackh726
Copy link
Member

jackh726 commented Oct 8, 2021

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 8, 2021

📌 Commit 77fce75 has been approved by jackh726

@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 Oct 8, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 8, 2021
…laumeGomez

Rollup of 6 pull requests

Successful merges:

 - rust-lang#86506 (Don't normalize xform_ret_ty during method candidate assembly )
 - rust-lang#89538 (Make rustdoc not highlight `->` and `=>` as operators)
 - rust-lang#89649 (clippy::complexity fixes)
 - rust-lang#89668 (Cfg hide more conditions for core and alloc)
 - rust-lang#89669 (Remove special-casing of never primitive in rustdoc-json-types)
 - rust-lang#89672 (Remove unwrap_or! macro)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit cda07c7 into rust-lang:master Oct 9, 2021
@rustbot rustbot added this to the 1.57.0 milestone Oct 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants