fix(core): dedupe project files in rust #17618
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
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
FrozenPandaz
force-pushed
the
dedupe-project-files-in-rust
branch
from
268ad29 to
b93e5de
Compare
FrozenPandaz
force-pushed
the
dedupe-project-files-in-rust
branch
2 times, most recently
from
c268339 to
78d7b4e
Compare
Cammisuli
reviewed
Jun 15, 2023
| } | ||
| (projects, file_hashes) | ||
| }); | ||
| Ok((projects, file_data)) | ||
| Ok(( | ||
| projects.into_iter().map(|(_, config)| config).collect(), |
There was a problem hiding this comment.
There's a clippy suggestion for this:
Suggested change
| projects.into_iter().map(|(_, config)| config).collect(), | |
| projects.into_values().collect(), |
Cammisuli
reviewed
Jun 15, 2023
| globs: &GlobSet, | ||
| ) { | ||
| if globs.is_match(&path) { | ||
| let parent = path.parent().unwrap_or(Path::new("")).to_path_buf(); |
There was a problem hiding this comment.
use unwrap_or_else so that it's lazily evaluated.
Suggested change
| let parent = path.parent().unwrap_or(Path::new("")).to_path_buf(); | |
| let parent = path.parent().unwrap_or_else(|| Path::new("")).to_path_buf(); |
Cammisuli
reviewed
Jun 15, 2023
Comment on lines
39
to
40
| if !existing_project | ||
| || (existing_project |
There was a problem hiding this comment.
This was a clippy warning too. We can remove the second existing_project check, because we already know it exists in this branch
Cammisuli
reviewed
Jun 15, 2023
Comment on lines
49
to
56
| } else { | ||
| if !config_paths.contains_key(&parent) { | ||
| config_paths.insert(parent, (path, content)); | ||
| } | ||
| } |
There was a problem hiding this comment.
clippy:
Suggested change
| } else { | |
| if !config_paths.contains_key(&parent) { | |
| config_paths.insert(parent, (path, content)); | |
| } | |
| } | |
| } else { | |
| config_paths.entry(parent).or_insert((path, content)); | |
| } |
Cammisuli
requested changes
Jun 15, 2023
FrozenPandaz
force-pushed
the
dedupe-project-files-in-rust
branch
from
78d7b4e to
4435464
Compare
FrozenPandaz
force-pushed
the
dedupe-project-files-in-rust
branch
from
4435464 to
4c7e33c
Compare
Cammisuli
approved these changes
Jun 15, 2023
|
This pull request has already been merged/closed. If you experience issues related to these changes, please open a new issue referencing this pull request. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Current Behavior
When getting config files via rust, config files were not deduped.
Expected Behavior
Getting config files via rust, config files are deduped properly.
Related Issue(s)
Fixes #