Clean up ImportMap
#15181
Merged
Clean up ImportMap
#15181
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
Also micro-optimizes fuzzy search.
rustbot
added
the
S-waiting-on-review
lowr
force-pushed
the
patch/import-map-purge-unused
branch
from
e6d0ef3
to
5db0e1a
Compare
lowr
commented
Jun 30, 2023
Comment on lines
-449
to
-452
| let mut all_indexed_values = FxHashSet::default(); | ||
| while let Some((_, indexed_values)) = stream.next() { | ||
| all_indexed_values.extend(indexed_values.iter().copied()); | ||
| } |
There was a problem hiding this comment.
I've seen #7912, but I couldn't reproduce the duplication and I don't really think it's possible due to how fst works. Let me know if I'm missing anything.
Comment on lines
308
to
316
| SearchMode::Fuzzy => { | ||
| let mut unchecked_query_chars = query_string.chars(); | ||
| let mut mismatching_query_char = unchecked_query_chars.next(); | ||
|
|
||
| for input_char in input.chars() { | ||
| match mismatching_query_char { | ||
| None => return true, | ||
| Some(matching_query_char) if matching_query_char == input_char => { | ||
| mismatching_query_char = unchecked_query_chars.next(); | ||
| } | ||
| _ => (), | ||
| let mut input_chars = input.chars(); | ||
| for query_char in query_string.chars() { | ||
| if input_chars.find(|&it| it == query_char).is_none() { | ||
| return false; | ||
| } | ||
| } | ||
| mismatching_query_char.is_none() | ||
| true | ||
| } |
There was a problem hiding this comment.
This micro-optimization is based on https://rust.godbolt.org/z/jvMcT783o
Veykril
approved these changes
Jul 3, 2023
|
@bors r+ |
|
☀️ Test successful - checks-actions |
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.
There are several things in
hir_def::import_mapthat are never used. This PR removes them and restructures the code. Namely:Query::name_only, because it's always true.ImportPathand changesImportInfoto only store items' name, which should reduce the memory consumption to some extent.SearchMode::ContainsforQuerybecause it's never used.Query::assoc_items_onlyandQuery::exclude_import_kindsintoQuery::assoc_mode, because the latter is never used besides filtering associated items out.Best reviewed one commit at a time. I made sure each commit passes full test suite. I can squash the first three commits if needed.