Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Clippy fixes for 1.80 (#13987)

Browse source 
The biggest hurdle turned out to be use of `Arc<Language>` in maps, as
`clippy::mutable_key_type` started triggering on it (due to - I suppose
- internal mutability on `HighlightMap`?). I switched over to using
`LanguageId` as the key type in some of the callsites, as that's what
`Language` uses anyways for it's hash/eq, though I've still had to
suppress the lint outside of language crate.

/cc @maxdeviant , le clippy guru.

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2024-07-10 17:53:17 +02:00 • committed by GitHub
parent d4ddc4c62c
commit 33a67ad6b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 12 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/language/src/syntax_map.rs
View file

@ -1207,7 +1207,7 @@ fn get_injections(
language_registry: &Arc<LanguageRegistry>,
depth: usize,
changed_ranges: &[Range<usize>],
combined_injection_ranges: &mut HashMap<Arc<Language>, Vec<tree_sitter::Range>>,
combined_injection_ranges: &mut HashMap<LanguageId, (Arc<Language>, Vec<tree_sitter::Range>)>,
queue: &mut BinaryHeap<ParseStep>,
) {
let mut query_cursor = QueryCursorHandle::new();
@ -1223,7 +1223,7 @@ fn get_injections(
.now_or_never()
.and_then(|language| language.ok())
{
combined_injection_ranges.insert(language, Vec::new());
combined_injection_ranges.insert(language.id, (language, Vec::new()));
}
}
}
@ -1276,8 +1276,9 @@ fn get_injections(
if let Some(language) = language {
if combined {
combined_injection_ranges
.entry(language.clone())
.or_default()
.entry(language.id)
.or_insert_with(|| (language.clone(), vec![]))
.1
.extend(content_ranges);
} else {
queue.push(ParseStep {
@ -1303,7 +1304,7 @@ fn get_injections(
}
}
for (language, mut included_ranges) in combined_injection_ranges.drain() {
for (_, (language, mut included_ranges)) in combined_injection_ranges.drain() {
included_ranges.sort_unstable_by(|a, b| {
Ord::cmp(&a.start_byte, &b.start_byte).then_with(|| Ord::cmp(&a.end_byte, &b.end_byte))
});