Skip to content

Use Option::unwrap_or instead of open-coding it - #81095

Merged
bors merged 1 commit into
rust-lang:masterfrom
LingMan:unwrap
Jan 17, 2021
Merged

Use Option::unwrap_or instead of open-coding it#81095
bors merged 1 commit into
rust-lang:masterfrom
LingMan:unwrap

Conversation

@LingMan

Copy link
Copy Markdown
Contributor

r? @oli-obk Noticed this while we were talking about the other PR just now 😆
@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 16, 2021
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 16, 2021
@oli-obk

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Jan 16, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 5a706cf has been approved by oli-obk

@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 16, 2021
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Jan 16, 2021
Use Option::unwrap_or instead of open-coding it
r? `@oli-obk` Noticed this while we were talking about the other PR just now 😆
`@rustbot` modify labels +C-cleanup +T-compiler
@m-ou-sem-ou-se mentioned this pull request Jan 16, 2021
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Jan 17, 2021
Use Option::unwrap_or instead of open-coding it
r? ``@oli-obk`` Noticed this while we were talking about the other PR just now 😆
``@rustbot`` modify labels +C-cleanup +T-compiler
@m-ou-sem-ou-se mentioned this pull request Jan 17, 2021
@m-ou-sem-ou-se mentioned this pull request Jan 17, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 17, 2021
Rollup of 13 pull requests
Successful merges:
- rust-lang#79298 (correctly deal with late-bound lifetimes in anon consts)
- rust-lang#80031 (resolve: Reject ambiguity built-in attr vs different built-in attr)
- rust-lang#80201 (Add benchmark and fast path for BufReader::read_exact)
- rust-lang#80635 (Improve diagnostics when closure doesn't meet trait bound)
- rust-lang#80765 (resolve: Simplify collection of traits in scope)
- rust-lang#80932 (Allow downloading LLVM on Windows and MacOS)
- rust-lang#80983 (Remove is_dllimport_foreign_item definition from cg_ssa)
- rust-lang#81064 (Support non-stage0 check)
- rust-lang#81080 (Force vec![] to expression position only)
- rust-lang#81082 (BTreeMap: clean up a few more comments)
- rust-lang#81084 (Use Option::map instead of open-coding it)
- rust-lang#81095 (Use Option::unwrap_or instead of open-coding it)
- rust-lang#81107 (Add NonZeroUn::is_power_of_two)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 7e2425a into rust-lang:masterJan 17, 2021
@rustbotrustbot added this to the 1.51.0 milestone Jan 17, 2021
@LingMan
LingMan deleted the unwrap branch January 17, 2021 18:01
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.

5 participants

@LingMan@oli-obk@bors@rust-highfive@rustbot