[rustc_attr][nit] Replace filter + is_some with map_or.
#114340
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @b-naber (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
lqd
reviewed
Aug 1, 2023
compiler/rustc_attr/src/builtin.rs
Outdated
| @@ -28,7 +28,7 @@ pub fn rust_version_symbol() -> Symbol { | |||
| } | |||
|
|
|||
| pub fn is_builtin_attr(attr: &Attribute) -> bool { | |||
| attr.is_doc_comment() || attr.ident().filter(|ident| is_builtin_attr_name(ident.name)).is_some() | |||
| attr.is_doc_comment() || attr.ident().map_or(false, |ident| is_builtin_attr_name(ident.name)) | |||
There was a problem hiding this comment.
Option::is_some_and seems clearer and communicates the intent better?
There was a problem hiding this comment.
agreed! Thanks for the great suggestion!
It's slightly shorter and better communicates the intent.
|
Thanks! (keep up the great work on the Perf Summit :) @bors r+ rollup |
bors
added
S-waiting-on-bors
|
Thank you so much for the kind words and your thoughtful code review, @lqd! People like you, who make Rust community super welcoming and helpful are the real heroes! |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 2, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#114178 (Account for macros when suggesting a new let binding) - rust-lang#114199 (Don't unsize coerce infer vars in select in new solver) - rust-lang#114301 (Don't check unnecessarily that impl trait is RPIT) - rust-lang#114314 (Tweaks to `adt_sized_constraint`) - rust-lang#114322 (Fix invalid slice coercion suggestion reported in turbofish) - rust-lang#114340 ([rustc_attr][nit] Replace `filter` + `is_some` with `map_or`.) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It's slightly shorter and better communicates the intent.