mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-30 22:01:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Avoid PEP 585 rewrites when builtins are shadowed (#3286)

Browse source
This commit is contained in:
Charlie Marsh 2023-02-28 18:25:42 -05:00 • committed by GitHub
parent af5f7dbd83
commit a032b66c2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/ruff/resources/test/fixtures/pyupgrade/UP006.py vendored
View file

@ -28,3 +28,10 @@ def f(x: IList[str]) -> None:
def f(x: "List[str]") -> None:
...
list = "abc"
def f(x: List[str]) -> None:
...

7
crates/ruff/src/rules/pyupgrade/rules/use_pep585_annotation.rs
View file

@ -26,7 +26,7 @@ impl AlwaysAutofixableViolation for DeprecatedCollectionType {
fn autofix_title(&self) -> String {
let DeprecatedCollectionType { name } = self;
format!("Replace `{name}` with `{}`", name.to_lowercase(),)
format!("Replace `{name}` with `{}`", name.to_lowercase())
}
}
@ -43,12 +43,15 @@ pub fn use_pep585_annotation(checker: &mut Checker, expr: &Expr) {
Range::from_located(expr),
);
if checker.patch(diagnostic.kind.rule()) {
let binding = binding.to_lowercase();
if checker.is_builtin(&binding) {
diagnostic.amend(Fix::replacement(
binding.to_lowercase(),
binding,
expr.location,
expr.end_location.unwrap(),
));
}
}
checker.diagnostics.push(diagnostic);
}
}

11
crates/ruff/src/rules/pyupgrade/snapshots/ruff__rules__pyupgrade__tests__UP006.py.snap
View file

@ -74,4 +74,15 @@ expression: diagnostics
row: 25
column: 14
parent: ~
- kind:
DeprecatedCollectionType:
name: List
location:
row: 36
column: 9
end_location:
row: 36
column: 13
fix: ~
parent: ~