Adds sort for RecordLit comparison in SSR #3765
Merged
Conversation
This file contains hidden or 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
edwin0cheng
reviewed
Mar 29, 2020
crates/ra_ide/src/ssr.rs
Outdated
Comment on lines
201
to
204
| if pattern_fields.is_none() && code_fields.is_none() { | ||
| return Some(match_); | ||
| } | ||
|
|
||
| if pattern_fields.is_none() || code_fields.is_none() { | ||
| return None; | ||
| } | ||
|
|
||
| let mut pattern_fields = pattern_fields.unwrap().collect::<Vec<_>>(); | ||
| let mut code_fields = code_fields.unwrap().collect::<Vec<_>>(); | ||
|
|
||
| if pattern_fields.len() != code_fields.len() { | ||
| return None; | ||
| } |
Contributor
There was a problem hiding this comment.
A single match might be better ? e.g.:
let (pattern_fields, code_fields) = match (pattern_fileds, code_fields) {
...
Contributor
Author
There was a problem hiding this comment.
I rewrote it little bit differently.
mikhail-m1
force-pushed
the
i3186-separated
branch
from
cc93943 to
8dd9777
Compare
mikhail-m1
commented
Mar 30, 2020
| ) | ||
| } | ||
|
|
||
| fn check_opt_nodes( |
Contributor
Author
There was a problem hiding this comment.
I am going to use this functions for function call vs method call check.
edwin0cheng
reviewed
Mar 31, 2020
|
|
||
| fn check_opt_nodes( | ||
| pattern: Option<impl AstNode>, | ||
| code: Option<impl AstNode>, |
Contributor
There was a problem hiding this comment.
Do we really need to pass these as Option here? Seem like the all call sites of it could change to :
check_opt_nodes(pattern.path()?, code.path()?, placeholders, match_);
Contributor
Author
There was a problem hiding this comment.
I missed (None,None) arm, added
Contributor
|
LGTM with a nit, but personally I don't like multiple long inline functions in rust but we could refactor it later on. |
mikhail-m1
force-pushed
the
i3186-separated
branch
from
8dd9777 to
47e8f3c
Compare
Contributor
|
bors r+ Thanks @mikhail-m1 |
Contributor
Build succeeded |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
an item from #3186