[Merged by Bors] - Nightly clippy fixes #2702
Conversation
- Unnecessary boxing, collapsing if, adding unwrap_or_default
Nested case returns a separate value
| @@ -136,6 +136,7 @@ impl RenderResourceBindings { | |||
| } | |||
| } | |||
|
|
|||
| #[allow(clippy::collapsible_match)] | |||
There was a problem hiding this comment.
Is this a bug in the new clippy rule? With the else in line 152, the change clippy suggests would change the logic.
There was a problem hiding this comment.
The clippy docs state "this lint is not intended to find all cases where nested match patterns can be merged" (https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_match). I interpreted this to mean that in cases where the nested match makes sense - like this one where the nested if returns a different value - you can just ignore it.
There was a problem hiding this comment.
As @DJMcNab just pointed out, the other change for this rule also breaks the logic. The rule seems to suggest this change too easily imo.
NiklasEi
added
C-Code-Quality
| if let Some(delay) = delay { | ||
| std::thread::sleep(delay); | ||
| } | ||
| while let Ok(Some(delay)) = tick(&mut app, wait) { |
There was a problem hiding this comment.
This changes the semantics to be wrong, specifically when the runner settings are to run as often as possible
I'm shocked that clippy is suggesting this change to be honest.
There was a problem hiding this comment.
Should I change it back to what it was and just add an #allow for this lint then?
There was a problem hiding this comment.
Yeah, I would just revert and #allow.
This issue is already reported to clippy: rust-lang/rust-clippy#7575
|
if some of the lints on nightly have issues, I think they should not be fixed (or allowed) on Bevy until the lints are stable |
bjorn3
added
the
S-Ready-For-Final-Review
|
bors r+ |
A few minor changes to fix warnings emitted from clippy on the nightly toolchain, including redundant_allocation, unwrap_or_else_default, and collapsible_match, fixes #2698
A few minor changes to fix warnings emitted from clippy on the nightly toolchain, including redundant_allocation, unwrap_or_else_default, and collapsible_match, fixes #2698