mirror of
https://github.com/astral-sh/ruff.git
synced 2025-11-20 04:29:47 +00:00
[flake8-bugbear] Omit annotation in preview fix for B006 (#20877)
Some checks are pending
CI / cargo build (release) (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 / 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 (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 / Fuzz for new ty panics (push) Blocked by required conditions
CI / cargo shear (push) Blocked by required conditions
CI / ty completion evaluation (push) Blocked by required conditions
CI / python package (push) Waiting to run
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 / check playground (push) Blocked by required conditions
CI / benchmarks instrumented (ruff) (push) Blocked by required conditions
CI / benchmarks instrumented (ty) (push) Blocked by required conditions
CI / benchmarks walltime (medium|multithreaded) (push) Blocked by required conditions
CI / benchmarks walltime (small|large) (push) Blocked by required conditions
Some checks are pending
CI / cargo build (release) (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 / 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 (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 / Fuzz for new ty panics (push) Blocked by required conditions
CI / cargo shear (push) Blocked by required conditions
CI / ty completion evaluation (push) Blocked by required conditions
CI / python package (push) Waiting to run
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 / check playground (push) Blocked by required conditions
CI / benchmarks instrumented (ruff) (push) Blocked by required conditions
CI / benchmarks instrumented (ty) (push) Blocked by required conditions
CI / benchmarks walltime (medium|multithreaded) (push) Blocked by required conditions
CI / benchmarks walltime (small|large) (push) Blocked by required conditions
Closes #20864
This commit is contained in:
parent
e1e3eb7209
commit
abf685b030
3 changed files with 15 additions and 21 deletions
|
|
@ -188,16 +188,10 @@ fn move_initialization(
|
||||||
content.push_str(stylist.line_ending().as_str());
|
content.push_str(stylist.line_ending().as_str());
|
||||||
content.push_str(stylist.indentation());
|
content.push_str(stylist.indentation());
|
||||||
if is_b006_unsafe_fix_preserve_assignment_expr_enabled(checker.settings()) {
|
if is_b006_unsafe_fix_preserve_assignment_expr_enabled(checker.settings()) {
|
||||||
let annotation = if let Some(ann) = parameter.annotation() {
|
|
||||||
format!(": {}", locator.slice(ann))
|
|
||||||
} else {
|
|
||||||
String::new()
|
|
||||||
};
|
|
||||||
let _ = write!(
|
let _ = write!(
|
||||||
&mut content,
|
&mut content,
|
||||||
"{}{} = {}",
|
"{} = {}",
|
||||||
parameter.parameter.name(),
|
parameter.parameter.name(),
|
||||||
annotation,
|
|
||||||
locator.slice(
|
locator.slice(
|
||||||
parenthesized_range(
|
parenthesized_range(
|
||||||
default.into(),
|
default.into(),
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ help: Replace with `None`; initialize within function
|
||||||
5 + def import_module_wrong(value: dict[str, str] = None):
|
5 + def import_module_wrong(value: dict[str, str] = None):
|
||||||
6 | import os
|
6 | import os
|
||||||
7 + if value is None:
|
7 + if value is None:
|
||||||
8 + value: dict[str, str] = {}
|
8 + value = {}
|
||||||
9 |
|
9 |
|
||||||
10 |
|
10 |
|
||||||
11 | def import_module_with_values_wrong(value: dict[str, str] = {}):
|
11 | def import_module_with_values_wrong(value: dict[str, str] = {}):
|
||||||
|
|
@ -38,7 +38,7 @@ help: Replace with `None`; initialize within function
|
||||||
10 | import os
|
10 | import os
|
||||||
11 |
|
11 |
|
||||||
12 + if value is None:
|
12 + if value is None:
|
||||||
13 + value: dict[str, str] = {}
|
13 + value = {}
|
||||||
14 | return 2
|
14 | return 2
|
||||||
15 |
|
15 |
|
||||||
16 |
|
16 |
|
||||||
|
|
@ -62,7 +62,7 @@ help: Replace with `None`; initialize within function
|
||||||
17 | import sys
|
17 | import sys
|
||||||
18 | import itertools
|
18 | import itertools
|
||||||
19 + if value is None:
|
19 + if value is None:
|
||||||
20 + value: dict[str, str] = {}
|
20 + value = {}
|
||||||
21 |
|
21 |
|
||||||
22 |
|
22 |
|
||||||
23 | def from_import_module_wrong(value: dict[str, str] = {}):
|
23 | def from_import_module_wrong(value: dict[str, str] = {}):
|
||||||
|
|
@ -83,7 +83,7 @@ help: Replace with `None`; initialize within function
|
||||||
21 + def from_import_module_wrong(value: dict[str, str] = None):
|
21 + def from_import_module_wrong(value: dict[str, str] = None):
|
||||||
22 | from os import path
|
22 | from os import path
|
||||||
23 + if value is None:
|
23 + if value is None:
|
||||||
24 + value: dict[str, str] = {}
|
24 + value = {}
|
||||||
25 |
|
25 |
|
||||||
26 |
|
26 |
|
||||||
27 | def from_imports_module_wrong(value: dict[str, str] = {}):
|
27 | def from_imports_module_wrong(value: dict[str, str] = {}):
|
||||||
|
|
@ -106,7 +106,7 @@ help: Replace with `None`; initialize within function
|
||||||
26 | from os import path
|
26 | from os import path
|
||||||
27 | from sys import version_info
|
27 | from sys import version_info
|
||||||
28 + if value is None:
|
28 + if value is None:
|
||||||
29 + value: dict[str, str] = {}
|
29 + value = {}
|
||||||
30 |
|
30 |
|
||||||
31 |
|
31 |
|
||||||
32 | def import_and_from_imports_module_wrong(value: dict[str, str] = {}):
|
32 | def import_and_from_imports_module_wrong(value: dict[str, str] = {}):
|
||||||
|
|
@ -129,7 +129,7 @@ help: Replace with `None`; initialize within function
|
||||||
31 | import os
|
31 | import os
|
||||||
32 | from sys import version_info
|
32 | from sys import version_info
|
||||||
33 + if value is None:
|
33 + if value is None:
|
||||||
34 + value: dict[str, str] = {}
|
34 + value = {}
|
||||||
35 |
|
35 |
|
||||||
36 |
|
36 |
|
||||||
37 | def import_docstring_module_wrong(value: dict[str, str] = {}):
|
37 | def import_docstring_module_wrong(value: dict[str, str] = {}):
|
||||||
|
|
@ -152,7 +152,7 @@ help: Replace with `None`; initialize within function
|
||||||
36 | """Docstring"""
|
36 | """Docstring"""
|
||||||
37 | import os
|
37 | import os
|
||||||
38 + if value is None:
|
38 + if value is None:
|
||||||
39 + value: dict[str, str] = {}
|
39 + value = {}
|
||||||
40 |
|
40 |
|
||||||
41 |
|
41 |
|
||||||
42 | def import_module_wrong(value: dict[str, str] = {}):
|
42 | def import_module_wrong(value: dict[str, str] = {}):
|
||||||
|
|
@ -175,7 +175,7 @@ help: Replace with `None`; initialize within function
|
||||||
41 | """Docstring"""
|
41 | """Docstring"""
|
||||||
42 | import os; import sys
|
42 | import os; import sys
|
||||||
43 + if value is None:
|
43 + if value is None:
|
||||||
44 + value: dict[str, str] = {}
|
44 + value = {}
|
||||||
45 |
|
45 |
|
||||||
46 |
|
46 |
|
||||||
47 | def import_module_wrong(value: dict[str, str] = {}):
|
47 | def import_module_wrong(value: dict[str, str] = {}):
|
||||||
|
|
@ -197,7 +197,7 @@ help: Replace with `None`; initialize within function
|
||||||
45 + def import_module_wrong(value: dict[str, str] = None):
|
45 + def import_module_wrong(value: dict[str, str] = None):
|
||||||
46 | """Docstring"""
|
46 | """Docstring"""
|
||||||
47 + if value is None:
|
47 + if value is None:
|
||||||
48 + value: dict[str, str] = {}
|
48 + value = {}
|
||||||
49 | import os; import sys; x = 1
|
49 | import os; import sys; x = 1
|
||||||
50 |
|
50 |
|
||||||
51 |
|
51 |
|
||||||
|
|
@ -220,7 +220,7 @@ help: Replace with `None`; initialize within function
|
||||||
51 | """Docstring"""
|
51 | """Docstring"""
|
||||||
52 | import os; import sys
|
52 | import os; import sys
|
||||||
53 + if value is None:
|
53 + if value is None:
|
||||||
54 + value: dict[str, str] = {}
|
54 + value = {}
|
||||||
55 |
|
55 |
|
||||||
56 |
|
56 |
|
||||||
57 | def import_module_wrong(value: dict[str, str] = {}):
|
57 | def import_module_wrong(value: dict[str, str] = {}):
|
||||||
|
|
@ -241,7 +241,7 @@ help: Replace with `None`; initialize within function
|
||||||
55 + def import_module_wrong(value: dict[str, str] = None):
|
55 + def import_module_wrong(value: dict[str, str] = None):
|
||||||
56 | import os; import sys
|
56 | import os; import sys
|
||||||
57 + if value is None:
|
57 + if value is None:
|
||||||
58 + value: dict[str, str] = {}
|
58 + value = {}
|
||||||
59 |
|
59 |
|
||||||
60 |
|
60 |
|
||||||
61 | def import_module_wrong(value: dict[str, str] = {}):
|
61 | def import_module_wrong(value: dict[str, str] = {}):
|
||||||
|
|
@ -261,7 +261,7 @@ help: Replace with `None`; initialize within function
|
||||||
- def import_module_wrong(value: dict[str, str] = {}):
|
- def import_module_wrong(value: dict[str, str] = {}):
|
||||||
59 + def import_module_wrong(value: dict[str, str] = None):
|
59 + def import_module_wrong(value: dict[str, str] = None):
|
||||||
60 + if value is None:
|
60 + if value is None:
|
||||||
61 + value: dict[str, str] = {}
|
61 + value = {}
|
||||||
62 | import os; import sys; x = 1
|
62 | import os; import sys; x = 1
|
||||||
63 |
|
63 |
|
||||||
64 |
|
64 |
|
||||||
|
|
@ -282,7 +282,7 @@ help: Replace with `None`; initialize within function
|
||||||
63 + def import_module_wrong(value: dict[str, str] = None):
|
63 + def import_module_wrong(value: dict[str, str] = None):
|
||||||
64 | import os; import sys
|
64 | import os; import sys
|
||||||
65 + if value is None:
|
65 + if value is None:
|
||||||
66 + value: dict[str, str] = {}
|
66 + value = {}
|
||||||
67 |
|
67 |
|
||||||
68 |
|
68 |
|
||||||
69 | def import_module_wrong(value: dict[str, str] = {}): import os
|
69 | def import_module_wrong(value: dict[str, str] = {}): import os
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ help: Replace with `None`; initialize within function
|
||||||
10 + def baz(a: list = None):
|
10 + def baz(a: list = None):
|
||||||
11 | """This one raises a different exception"""
|
11 | """This one raises a different exception"""
|
||||||
12 + if a is None:
|
12 + if a is None:
|
||||||
13 + a: list = []
|
13 + a = []
|
||||||
14 | raise IndexError()
|
14 | raise IndexError()
|
||||||
15 |
|
15 |
|
||||||
16 |
|
16 |
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue