Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

F401 sort bindings before adding to __all__ #11648

Merged
merged 2 commits into from
May 31, 2024
Merged

F401 sort bindings before adding to __all__ #11648

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15977ed
sort bindings before adding to __all__
plredmond May 31, 2024
cbc6fe7
Use vec
charliermarsh May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions crates/ruff_linter/src/rules/pyflakes/rules/unused_import.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ pub(crate) fn unused_import(checker: &Checker, scope: &Scope, diagnostics: &mut
fix_by_reexporting(
checker,
import_statement,
&to_reexport.iter().map(|(b, _)| b).collect::<Vec<_>>(),
&mut to_reexport.iter().map(|(b, _)| b).collect::<Vec<_>>(),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should just pass in the Vec here, so the ownership is clearer? Then it can be mut imports: Vec<&ImportBinding> and callers don't need to worry about the mutation.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tweaking this quickly so I can include in the release.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok! Thanks for explaining

&dunder_all_exprs,
)
.ok(),
Expand Down Expand Up @@ -450,14 +450,15 @@ fn fix_by_removing_imports<'a>(
fn fix_by_reexporting(
checker: &Checker,
node_id: NodeId,
imports: &[&ImportBinding],
imports: &mut [&ImportBinding],
dunder_all_exprs: &[&ast::Expr],
) -> Result<Fix> {
let statement = checker.semantic().statement(node_id);
if imports.is_empty() {
bail!("Expected import bindings");
}

imports.sort_by_key(|b| b.name);
let edits = match dunder_all_exprs {
[] => fix::edits::make_redundant_alias(
imports.iter().map(|b| b.import.member_name()),
Expand Down
Loading