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 instead of open-coding it #81084

Merged
merged 1 commit into from
Jan 17, 2021
Merged

Use Option::map instead of open-coding it #81084

merged 1 commit into from
Jan 17, 2021

Conversation

LingMan
Copy link
Contributor

@LingMan LingMan commented Jan 16, 2021

r? @oli-obk
@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 16, 2021
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 16, 2021
oli-obk
oli-obk reviewed Jan 16, 2021
View reviewed changes
Copy link
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should move to using map and friends in favour of ? without an accepted MCP (and I'm personally against it, but will not block it if there is enough preference for it in the compiler team)

compiler/rustc_ast/src/attr/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_codegen_llvm/src/llvm_util.rs Outdated Show resolved Hide resolved
compiler/rustc_mir/src/borrow_check/type_check/input_output.rs Show resolved Hide resolved
compiler/rustc_typeck/src/check/compare_method.rs Show resolved Hide resolved
compiler/rustc_typeck/src/check/compare_method.rs Show resolved Hide resolved
@oli-obk
Copy link
Contributor

oli-obk commented Jan 16, 2021

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 16, 2021

📌 Commit 76003f3 has been approved by oli-obk

@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 16, 2021
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Jan 16, 2021
@m-ou-se
Rollup merge of rust-lang#81084 - LingMan:map, r=oli-obk
6b66591 
Use Option::map instead of open-coding it

r? `@oli-obk`
`@rustbot` modify labels +C-cleanup +T-compiler
@m-ou-se m-ou-se mentioned this pull request Jan 16, 2021
Closed
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Jan 17, 2021
@m-ou-se
Rollup merge of rust-lang#81084 - LingMan:map, r=oli-obk
076c019 
Use Option::map instead of open-coding it

r? ``@oli-obk``
``@rustbot`` modify labels +C-cleanup +T-compiler
@m-ou-se m-ou-se mentioned this pull request Jan 17, 2021
Closed
@m-ou-se m-ou-se mentioned this pull request Jan 17, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 17, 2021
@bors
Auto merge of rust-lang#81113 - m-ou-se:rollup-a1unz4x, r=m-ou-se
edeb631 
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 34e073f into rust-lang:master Jan 17, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 17, 2021
@LingMan LingMan deleted the map branch January 17, 2021 18:01
@sdroege sdroege mentioned this pull request Feb 4, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

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.
5 participants
@LingMan @oli-obk @bors @rust-highfive @rustbot