Skip to content

Use Option::map_or instead of .map(..).unwrap_or(..) - #80944

Merged
bors merged 1 commit into
rust-lang:masterfrom
LingMan:map_or
Jan 15, 2021
Merged

Use Option::map_or instead of .map(..).unwrap_or(..)#80944
bors merged 1 commit into
rust-lang:masterfrom
LingMan:map_or

Conversation

@LingMan

Copy link
Copy Markdown
Contributor

@rustbot modify labels +C-cleanup +T-compiler

@rustbotrustbot added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 12, 2021
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @matthewjasper

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 12, 2021
@bors

bors commented Jan 13, 2021

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #79322) made this pull request unmergeable. Please resolve the merge conflicts.

@nagisa

Copy link
Copy Markdown
Member

@bors r+ rollup

Thanks, seems reasonable enough!

@bors

bors commented Jan 13, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 52adfdd has been approved by nagisa

@borsbors 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 Jan 13, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 14, 2021
Use Option::map_or instead of `.map(..).unwrap_or(..)`
`@rustbot` modify labels +C-cleanup +T-compiler
@JohnTitorJohnTitor mentioned this pull request Jan 14, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 14, 2021
Use Option::map_or instead of `.map(..).unwrap_or(..)`
``@rustbot`` modify labels +C-cleanup +T-compiler
@JohnTitorJohnTitor mentioned this pull request Jan 14, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 14, 2021
Use Option::map_or instead of `.map(..).unwrap_or(..)`
```@rustbot``` modify labels +C-cleanup +T-compiler
@JohnTitorJohnTitor mentioned this pull request Jan 14, 2021
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Jan 14, 2021
Use Option::map_or instead of `.map(..).unwrap_or(..)`
````@rustbot```` modify labels +C-cleanup +T-compiler
This was referenced Jan 14, 2021
@bors

bors commented Jan 14, 2021

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #79328) made this pull request unmergeable. Please resolve the merge conflicts.

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 14, 2021
@LingMan

Copy link
Copy Markdown
ContributorAuthor

@nagisa Do you need to reapprove after the rebase?
@rustbot modify labels -S-waiting-on-author +S-waiting-on-review

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 14, 2021
@nagisa

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 14, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit a56bffb has been approved by nagisa

@borsbors 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 Jan 14, 2021
@nagisa

Copy link
Copy Markdown
Member

@bors rollup-

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 14, 2021
Rollup of 17 pull requests
Successful merges:
- rust-lang#79982 (Add missing methods to unix ExitStatusExt)
- rust-lang#80017 (Suggest `_` and `..` if a pattern has too few fields)
- rust-lang#80169 (Recommend panic::resume_unwind instead of panicking.)
- rust-lang#80217 (Add a `std::io::read_to_string` function)
- rust-lang#80444 (Add as_ref and as_mut methods for Bound)
- rust-lang#80567 (Add Iterator::intersperse_with)
- rust-lang#80829 (Get rid of `DepConstructor`)
- rust-lang#80895 (Fix handling of malicious Readers in read_to_end)
- rust-lang#80966 (Deprecate atomic::spin_loop_hint in favour of hint::spin_loop)
- rust-lang#80969 (Use better ICE message when no MIR is available)
- rust-lang#80972 (Remove unstable deprecated Vec::remove_item)
- rust-lang#80973 (Update books)
- rust-lang#80980 (Fixed incorrect doc comment)
- rust-lang#80981 (Fix -Cpasses=list and llvm version print with -vV)
- rust-lang#80985 (Fix stabilisation version of slice_strip)
- rust-lang#80990 (llvm: Remove the unused context from CreateDebugLocation)
- rust-lang#80991 (Fix formatting specifiers doc links)
Failed merges:
- rust-lang#80944 (Use Option::map_or instead of `.map(..).unwrap_or(..)`)
r? `@ghost`
`@rustbot` modify labels: rollup
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 15, 2021
Use Option::map_or instead of `.map(..).unwrap_or(..)`
`@rustbot` modify labels +C-cleanup +T-compiler
@JohnTitorJohnTitor mentioned this pull request Jan 15, 2021
@JohnTitorJohnTitor mentioned this pull request Jan 15, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 15, 2021
Rollup of 5 pull requests
Successful merges:
- rust-lang#80254 (Don't try to add nested predicate to Rustdoc auto-trait `ParamEnv`)
- rust-lang#80834 (Remove unreachable panics from VecDeque::{front/back}[_mut])
- rust-lang#80944 (Use Option::map_or instead of `.map(..).unwrap_or(..)`)
- rust-lang#81008 (Don't ICE when computing a layout of a generator tainted by errors)
- rust-lang#81023 (Remove doctree::Variant)
Failed merges:
- rust-lang#81033 (Remove useless `clean::Variant` struct)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit a584d87 into rust-lang:masterJan 15, 2021
@rustbotrustbot added this to the 1.51.0 milestone Jan 15, 2021
@LingMan
LingMan deleted the map_or branch January 15, 2021 19:38
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

C-cleanupCategory: PRs that clean code up or issues documenting cleanup.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@LingMan@rust-highfive@bors@nagisa@matthewjasper@rustbot