Apply refactoring from cargo clippy #1931
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
nrc
approved these changes
Aug 30, 2017
| if let &WorkspaceHitlist::Some(ref hitlist) = self { | ||
| Some(&hitlist) | ||
| pub fn get_some(&self) -> Option<&[String]> { | ||
| if let WorkspaceHitlist::Some(ref hitlist) = *self { |
There was a problem hiding this comment.
I'm not sure why Clippy suggests this change - it looks fine either way to me
There was a problem hiding this comment.
I think the idea here is to prefer not to repeat & in pattern:
match *self {
A => ...,
B => ...,
C => ...,
}instead of
match self {
&A => ...,
&B => ...,
&C => ...,
}I agree that it is irrelevant in the case of if let Some(..) = *self v.s. if let &Some(..) = self.
Just to keep it consistent, I would like to use the former style here as well, if you don't mind.
src/expr.rs
Outdated
| @@ -932,7 +932,7 @@ struct ControlFlow<'a> { | |||
| span: Span, | |||
| } | |||
|
|
|||
| fn to_control_flow<'a>(expr: &'a ast::Expr, expr_type: ExprType) -> Option<ControlFlow<'a>> { | |||
There was a problem hiding this comment.
I don't think we should do this (or the similar changes elsewhere) - having the explicit lifetime inidicates that ControlFlow contains borrowed data.
topecongiro
force-pushed
the
cargo-clippy
branch
from
9ee612c to
9d49bd2
Compare
|
Updated & resolved conflicts. |
|
Thank you! |
andersk
added a commit
to andersk/rustfmt
that referenced
this pull request
Sep 16, 2017
This test was mistakenly inverted by commit 4b79055 (rust-lang#1931). $ cargo fmt --all thread 'main' panicked at 'called `Option::unwrap()` on a `None` value', /checkout/src/libcore/option.rs:335:20 note: Run with `RUST_BACKTRACE=1` for a backtrace. Signed-off-by: Anders Kaseorg <[email protected]>
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.
This PR applies refactoring suggested from running
cargo clippy.