Use question mark operator when possible #11865
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
ItsDoot
added
the
C-Code-Quality
ItsDoot
approved these changes
Feb 14, 2024
Malax
approved these changes
Feb 14, 2024
alice-i-cecile
approved these changes
Feb 14, 2024
alice-i-cecile
added
the
S-Ready-For-Final-Review
github-merge-queue bot
pushed a commit
that referenced
this pull request
Feb 14, 2024
# Objective - The current implementations for `&Visibility == Visibility` and `Visibility == &Visibility` are ambiguous, so they raise a warning for being unconditionally recursive. - `TaskPool`'s `LOCAL_EXECUTOR` thread local calls a `const` constructor in a non-`const` context. ## Solution - Make `&Visibility == Visibility` and `Visibility == &Visibility` implementations use `Visibility == Visibility`. - Wrap `LocalExecutor::new` in a special `const` block supported by [`thread_local`](https://doc.rust-lang.org/stable/std/macro.thread_local.html). --- This lints were found by running: ```shell $ cargo clippy --workspace ``` There are a few other warnings that were more complicated, so I chose not to include them in this PR. <details> <summary>Here they are...</summary> ```shell warning: function cannot return without recursing --> crates/bevy_utils/src/cow_arc.rs:92:5 | 92 | / fn eq(&self, other: &Self) -> bool { 93 | | self.deref().eq(other.deref()) 94 | | } | |_____^ | note: recursive call site --> crates/bevy_utils/src/cow_arc.rs:93:9 | 93 | self.deref().eq(other.deref()) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: method `get_path` is never used --> crates/bevy_reflect/src/serde/de.rs:26:8 | 25 | trait StructLikeInfo { | -------------- method in this trait 26 | fn get_path(&self) -> &str; | ^^^^^^^^ | = note: `#[warn(dead_code)]` on by default warning: methods `get_path` and `get_field` are never used --> crates/bevy_reflect/src/serde/de.rs:34:8 | 33 | trait TupleLikeInfo { | ------------- methods in this trait 34 | fn get_path(&self) -> &str; | ^^^^^^^^ 35 | fn get_field(&self, index: usize) -> Option<&UnnamedField>; | ^^^^^^^^^ ``` The other warnings are fixed by #11865. </details>
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.
Objective
let Some(x) = ... else { None };throughout the project.Option<T>implementsTry, it can use the question mark?operator.Solution
let Some(x) = ... else { None }.There was another PR that did a similar thing a few weeks ago, but I couldn't find it.