Avoid quadratic membership check in import fixes (#15576)
Some checks are pending
CI / cargo test (linux, release) (push) Blocked by required conditions
CI / cargo test (windows) (push) Blocked by required conditions
CI / cargo test (wasm) (push) Blocked by required conditions
CI / cargo build (release) (push) Waiting to run
CI / cargo build (msrv) (push) Blocked by required conditions
CI / cargo fuzz build (push) Blocked by required conditions
CI / fuzz parser (push) Blocked by required conditions
CI / test scripts (push) Blocked by required conditions
CI / ecosystem (push) Blocked by required conditions
CI / cargo shear (push) Blocked by required conditions
CI / python package (push) Waiting to run
CI / Determine changes (push) Waiting to run
CI / cargo fmt (push) Waiting to run
CI / cargo clippy (push) Blocked by required conditions
CI / cargo test (linux) (push) Blocked by required conditions
CI / pre-commit (push) Waiting to run
CI / mkdocs (push) Waiting to run
CI / formatter instabilities and black similarity (push) Blocked by required conditions
CI / test ruff-lsp (push) Blocked by required conditions
CI / benchmarks (push) Blocked by required conditions

## Summary

This leads to an explosion in runtime for (admittedly absurd) cases with
tens of thousands of imports.
This commit is contained in:
Charlie Marsh 2025-01-18 18:01:26 -05:00 committed by GitHub
parent 6004c8c003
commit b8e5b95423
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -7,6 +7,7 @@ use libcst_native::{
Codegen, CodegenState, Expression, ImportNames, NameOrAttribute, ParenthesizableWhitespace,
SmallStatement, Statement,
};
use rustc_hash::FxHashSet;
use smallvec::{smallvec, SmallVec};
use unicode_normalization::UnicodeNormalization;
@ -80,14 +81,11 @@ pub(crate) fn remove_imports<'a>(
// Preserve the trailing comma (or not) from the last entry.
let trailing_comma = aliases.last().and_then(|alias| alias.comma.clone());
for member in member_names {
let alias_index = aliases
.iter()
.position(|alias| member == qualified_name_from_name_or_attribute(&alias.name));
if let Some(index) = alias_index {
aliases.remove(index);
}
}
// Remove any imports that are specified in the `imports` iterator.
let member_names = member_names.collect::<FxHashSet<_>>();
aliases.retain(|alias| {
!member_names.contains(qualified_name_from_name_or_attribute(&alias.name).as_str())
});
// But avoid destroying any trailing comments.
if let Some(alias) = aliases.last_mut() {
@ -144,10 +142,10 @@ pub(crate) fn retain_imports(
// Preserve the trailing comma (or not) from the last entry.
let trailing_comma = aliases.last().and_then(|alias| alias.comma.clone());
// Retain any imports that are specified in the `imports` iterator.
let member_names = member_names.iter().copied().collect::<FxHashSet<_>>();
aliases.retain(|alias| {
member_names
.iter()
.any(|member| *member == qualified_name_from_name_or_attribute(&alias.name))
member_names.contains(qualified_name_from_name_or_attribute(&alias.name).as_str())
});
// But avoid destroying any trailing comments.