if $c:expr { Some($r:expr) } else { None } =>> $c.then(|| $r)#108090
Merged
bors merged 2 commits intorust-lang:masterfrom Feb 16, 2023
Hidden character warning
The head ref may contain hidden characters: "if_not_now_then_when\u2026"
Merged
if $c:expr { Some($r:expr) } else { None } =>> $c.then(|| $r)#108090bors merged 2 commits intorust-lang:masterfrom
if $c:expr { Some($r:expr) } else { None } =>> $c.then(|| $r)#108090bors merged 2 commits intorust-lang:masterfrom
Conversation
Collaborator
|
(rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
A-query-system
Collaborator
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt Some changes occurred in compiler/rustc_codegen_cranelift cc @bjorn3 |
Member
Author
Collaborator
|
📌 Commit 2f2833cbde8c13ecb7a286175006298c3fd8e94d has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
Collaborator
|
☔ The latest upstream changes (presumably #101841) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
rust-cloud-vms
bot
force-pushed
the
if_not_now_then_when…
branch
from
2f2833c to
5bf6a46
Compare
Member
Author
|
First 101841 got merge conflicts because of previous version of this being merged, then it had problems cause the rebase on master was conflicting with master not having the commits or something and now this PR has merge conflicts because 101841 got merged. What a story lol @bors r=oli-obk rollup |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 16, 2023
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#106347 (More accurate spans for arg removal suggestion) - rust-lang#108057 (Prevent some attributes from being merged with others on reexports) - rust-lang#108090 (`if $c:expr { Some($r:expr) } else { None }` =>> `$c.then(|| $r)`) - rust-lang#108092 (note issue for feature(packed_bundled_libs)) - rust-lang#108099 (use chars instead of strings where applicable) - rust-lang#108115 (Do not ICE on unmet trait alias bounds) - rust-lang#108125 (Add new people to the compiletest review rotation) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resurrection of #108079