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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
Jan 15, 2021
Merged

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

merged 1 commit into from
Jan 15, 2021

Conversation

LingMan
Copy link
Contributor

@LingMan LingMan commented Jan 12, 2021

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

@rustbot rustbot 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
Collaborator

r? @matthewjasper

(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 Jan 12, 2021
@bors
Copy link
Contributor

bors commented Jan 13, 2021

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

@nagisa
Copy link
Member

nagisa commented Jan 13, 2021

@bors r+ rollup

Thanks, seems reasonable enough!

@bors
Copy link
Contributor

bors commented Jan 13, 2021

📌 Commit 52adfdd has been approved by nagisa

@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 Jan 13, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 14, 2021
@JohnTitor
Rollup merge of rust-lang#80944 - LingMan:map_or, r=nagisa
3e42020 
Use Option::map_or instead of `.map(..).unwrap_or(..)`

`@rustbot` modify labels +C-cleanup +T-compiler
@JohnTitor JohnTitor mentioned this pull request Jan 14, 2021
Closed
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 14, 2021
@JohnTitor
Rollup merge of rust-lang#80944 - LingMan:map_or, r=nagisa
003431a 
Use Option::map_or instead of `.map(..).unwrap_or(..)`

``@rustbot`` modify labels +C-cleanup +T-compiler
@JohnTitor JohnTitor mentioned this pull request Jan 14, 2021
Closed
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 14, 2021
@JohnTitor
Rollup merge of rust-lang#80944 - LingMan:map_or, r=nagisa
f8ede5d 
Use Option::map_or instead of `.map(..).unwrap_or(..)`

```@rustbot``` modify labels +C-cleanup +T-compiler
@JohnTitor JohnTitor mentioned this pull request Jan 14, 2021
Closed
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Jan 14, 2021
@m-ou-se
Rollup merge of rust-lang#80944 - LingMan:map_or, r=nagisa
c0c379a 
Use Option::map_or instead of `.map(..).unwrap_or(..)`

````@rustbot```` modify labels +C-cleanup +T-compiler
This was referenced Jan 14, 2021
Closed
Merged
@bors
Copy link
Contributor

bors commented Jan 14, 2021

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

@bors bors 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
Contributor Author

LingMan commented Jan 14, 2021

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

@rustbot rustbot 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
Member

nagisa commented Jan 14, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Jan 14, 2021

📌 Commit a56bffb has been approved by nagisa

@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 Jan 14, 2021
@nagisa
Copy link
Member

nagisa commented Jan 14, 2021

@bors rollup-

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 14, 2021
@bors
Auto merge of rust-lang#81018 - m-ou-se:rollup-7202dc7, r=m-ou-se
e38fb30 
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
@JohnTitor
Rollup merge of rust-lang#80944 - LingMan:map_or, r=nagisa
9053e65 
Use Option::map_or instead of `.map(..).unwrap_or(..)`

`@rustbot` modify labels +C-cleanup +T-compiler
@JohnTitor JohnTitor mentioned this pull request Jan 15, 2021
Closed
@JohnTitor JohnTitor mentioned this pull request Jan 15, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 15, 2021
@bors
Auto merge of rust-lang#81035 - JohnTitor:rollup-9m03awf, r=JohnTitor
4e208f6 
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:master Jan 15, 2021
@rustbot rustbot 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 free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@matthewjasper matthewjasper

Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.51.0
Development

Successfully merging this pull request may close these issues.
6 participants
@LingMan @rust-highfive @bors @nagisa @matthewjasper @rustbot