-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
if $c:expr { Some($r:expr) } else { None }
=>> $c.then(|| $r)
#108090
The head ref may contain hidden characters: "if_not_now_then_when\u2026"
Conversation
(rustbot has picked a reviewer for you, use r? to override) |
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt Some changes occurred in compiler/rustc_codegen_cranelift cc @bjorn3 |
📌 Commit 2f2833cbde8c13ecb7a286175006298c3fd8e94d has been approved by It is now in the queue for this repository. |
☔ The latest upstream changes (presumably #101841) made this pull request unmergeable. Please resolve the merge conflicts. |
2f2833c
to
5bf6a46
Compare
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 |
…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
Resurrection of #108079