Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Patch abstraction from Fix (#987)

This commit is contained in:
Charlie Marsh 2022-12-01 16:04:42 -05:00 committed by GitHub
parent 2e89cd8802
commit af40e64d6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
105 changed files with 2594 additions and 2983 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/autofix/fixer.rs
View File

@ -6,7 +6,7 @@ use ropey::RopeBuilder;
use rustpython_parser::ast::Location;
use crate::ast::types::Range;
use crate::autofix::{Fix, Patch};
use crate::autofix::Fix;
use crate::checks::Check;
use crate::source_code_locator::SourceCodeLocator;
@ -58,36 +58,36 @@ fn apply_fixes<'a>(
) -> (Cow<'a, str>, usize) {
let mut output = RopeBuilder::new();
let mut last_pos: Location = Location::new(1, 0);
let mut applied: BTreeSet<&Patch> = BTreeSet::default();
let mut applied: BTreeSet<&Fix> = BTreeSet::default();
let mut num_fixed: usize = 0;
for fix in fixes.sorted_by_key(|fix| fix.patch.location) {
for fix in fixes.sorted_by_key(|fix| fix.location) {
// If we already applied an identical fix as part of another correction, skip
// any re-application.
if applied.contains(&fix.patch) {
if applied.contains(&fix) {
num_fixed += 1;
continue;
}
// Best-effort approach: if this fix overlaps with a fix we've already applied,
// skip it.
if last_pos > fix.patch.location {
if last_pos > fix.location {
continue;
}
// Add all contents from `last_pos` to `fix.patch.location`.
// Add all contents from `last_pos` to `fix.location`.
let slice = locator.slice_source_code_range(&Range {
location: last_pos,
end_location: fix.patch.location,
end_location: fix.location,
});
output.append(&slice);
// Add the patch itself.
output.append(&fix.patch.content);
output.append(&fix.content);
// Track that the fix was applied.
last_pos = fix.patch.end_location;
applied.insert(&fix.patch);
last_pos = fix.end_location;
applied.insert(fix);
num_fixed += 1;
}
@ -103,7 +103,7 @@ mod tests {
use rustpython_parser::ast::Location;
use crate::autofix::fixer::apply_fixes;
use crate::autofix::{Fix, Patch};
use crate::autofix::Fix;
use crate::SourceCodeLocator;
#[test]
@ -118,11 +118,9 @@ mod tests {
#[test]
fn apply_single_replacement() {
let fixes = vec![Fix {
patch: Patch {
content: "Bar".to_string(),
location: Location::new(1, 8),
end_location: Location::new(1, 14),
},
}];
let locator = SourceCodeLocator::new(
r#"
@ -146,11 +144,9 @@ class A(Bar):
#[test]
fn apply_single_removal() {
let fixes = vec![Fix {
patch: Patch {
content: String::new(),
location: Location::new(1, 7),
end_location: Location::new(1, 15),
},
}];
let locator = SourceCodeLocator::new(
r#"
@ -175,19 +171,15 @@ class A:
fn apply_double_removal() {
let fixes = vec![
Fix {
patch: Patch {
content: String::new(),
location: Location::new(1, 7),
end_location: Location::new(1, 16),
},
},
Fix {
patch: Patch {
content: String::new(),
location: Location::new(1, 16),
end_location: Location::new(1, 23),
},
},
];
let locator = SourceCodeLocator::new(
r#"
@ -213,19 +205,15 @@ class A:
fn ignore_overlapping_fixes() {
let fixes = vec![
Fix {
patch: Patch {
content: String::new(),
location: Location::new(1, 7),
end_location: Location::new(1, 15),
},
},
Fix {
patch: Patch {
content: "ignored".to_string(),
location: Location::new(1, 9),
end_location: Location::new(1, 11),
},
},
];
let locator = SourceCodeLocator::new(
r#"

15
src/autofix/mod.rs
View File

@ -5,55 +5,42 @@ pub mod fixer;
pub mod helpers;
#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
pub struct Patch {
pub struct Fix {
pub content: String,
pub location: Location,
pub end_location: Location,
}
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
pub struct Fix {
pub patch: Patch,
}
impl Fix {
pub fn deletion(start: Location, end: Location) -> Self {
Self {
patch: Patch {
content: String::new(),
location: start,
end_location: end,
},
}
}
pub fn replacement(content: String, start: Location, end: Location) -> Self {
Self {
patch: Patch {
content,
location: start,
end_location: end,
},
}
}
pub fn insertion(content: String, at: Location) -> Self {
Self {
patch: Patch {
content,
location: at,
end_location: at,
},
}
}
pub fn dummy(location: Location) -> Self {
Self {
patch: Patch {
content: String::new(),
location,
end_location: location,
},
}
}
}

2
src/check_ast.rs
View File

@ -2990,7 +2990,7 @@ impl<'a> Checker<'a> {
&deleted,
) {
Ok(fix) => {
if fix.patch.content.is_empty() || fix.patch.content == "pass" {
if fix.content.is_empty() || fix.content == "pass" {
self.deletions.insert(defined_by);
}
Some(fix)

5
src/eradicate/snapshots/ruff__eradicate__tests__ERA001_ERA001.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 1
column: 10
fix:
patch:
content: ""
location:
row: 1
@ -26,7 +25,6 @@ expression: checks
row: 2
column: 22
fix:
patch:
content: ""
location:
row: 2
@ -42,7 +40,6 @@ expression: checks
row: 3
column: 6
fix:
patch:
content: ""
location:
row: 3
@ -58,7 +55,6 @@ expression: checks
row: 5
column: 13
fix:
patch:
content: ""
location:
row: 5
@ -74,7 +70,6 @@ expression: checks
row: 12
column: 16
fix:
patch:
content: ""
location:
row: 12

4
src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B007_B007.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 6
column: 5
fix:
patch:
content: _i
location:
row: 6
@ -28,7 +27,6 @@ expression: checks
row: 18
column: 13
fix:
patch:
content: _k
location:
row: 18
@ -45,7 +43,6 @@ expression: checks
row: 30
column: 5
fix:
patch:
content: _i
location:
row: 30
@ -62,7 +59,6 @@ expression: checks
row: 30
column: 13
fix:
patch:
content: _k
location:
row: 30

5
src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B009_B009_B010.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 18
column: 19
fix:
patch:
content: foo.bar
location:
row: 18
@ -26,7 +25,6 @@ expression: checks
row: 19
column: 23
fix:
patch:
content: foo._123abc
location:
row: 19
@ -42,7 +40,6 @@ expression: checks
row: 20
column: 22
fix:
patch:
content: foo.abc123
location:
row: 20
@ -58,7 +55,6 @@ expression: checks
row: 21
column: 23
fix:
patch:
content: foo.abc123
location:
row: 21
@ -74,7 +70,6 @@ expression: checks
row: 22
column: 31
fix:
patch:
content: x.bar
location:
row: 22

5
src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B010_B009_B010.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 33
column: 25
fix:
patch:
content: foo.bar = None
location:
row: 33
@ -26,7 +25,6 @@ expression: checks
row: 34
column: 29
fix:
patch:
content: foo._123abc = None
location:
row: 34
@ -42,7 +40,6 @@ expression: checks
row: 35
column: 28
fix:
patch:
content: foo.abc123 = None
location:
row: 35
@ -58,7 +55,6 @@ expression: checks
row: 36
column: 29
fix:
patch:
content: foo.abc123 = None
location:
row: 36
@ -74,7 +70,6 @@ expression: checks
row: 37
column: 30
fix:
patch:
content: foo.bar.baz = None
location:
row: 37

2
src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B011_B011.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 8
column: 12
fix:
patch:
content: raise AssertionError()
location:
row: 8
@ -26,7 +25,6 @@ expression: checks
row: 10
column: 12
fix:
patch:
content: "raise AssertionError('message')"
location:
row: 10

1
src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B013_B013.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 3
column: 19
fix:
patch:
content: ValueError
location:
row: 3

3
src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B014_B014.py.snap
View File

@ -12,7 +12,6 @@ expression: checks
row: 17
column: 24
fix:
patch:
content: "OSError,"
location:
row: 17
@ -30,7 +29,6 @@ expression: checks
row: 28
column: 24
fix:
patch:
content: "MyError,"
location:
row: 28
@ -48,7 +46,6 @@ expression: checks
row: 49
column: 26
fix:
patch:
content: "re.error,"
location:
row: 49

2
src/flake8_comprehensions/snapshots/ruff__flake8_comprehensions__tests__C400_C400.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 1
column: 29
fix:
patch:
content: "[x for x in range(3)]"
location:
row: 1
@ -26,7 +25,6 @@ expression: checks
row: 4
column: 1
fix:
patch:
content: "[\n x for x in range(3)\n]"
location:
row: 2

2
src/flake8_comprehensions/snapshots/ruff__flake8_comprehensions__tests__C401_C401.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 1
column: 28
fix:
patch:
content: "{x for x in range(3)}"
location:
row: 1
@ -26,7 +25,6 @@ expression: checks
row: 4
column: 1
fix:
patch:
content: "{\n x for x in range(3)\n}"
location:
row: 2

2
src/flake8_comprehensions/snapshots/ruff__flake8_comprehensions__tests__C402_C402.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 1
column: 30
fix:
patch:
content: "{x: x for x in range(3)}"
location:
row: 1
@ -26,7 +25,6 @@ expression: checks
row: 4
column: 1
fix:
patch:
content: "{\n x: x for x in range(3)\n}"
location:
row: 2

2
src/flake8_comprehensions/snapshots/ruff__flake8_comprehensions__tests__C403_C403.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 1
column: 30
fix:
patch:
content: "{x for x in range(3)}"
location:
row: 1
@ -26,7 +25,6 @@ expression: checks
row: 4
column: 1
fix:
patch:
content: "{\n x for x in range(3)\n}"
location:
row: 2

1
src/flake8_comprehensions/snapshots/ruff__flake8_comprehensions__tests__C404_C404.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 1
column: 32
fix:
patch:
content: "{i: i for i in range(3)}"
location:
row: 1

4
src/flake8_comprehensions/snapshots/ruff__flake8_comprehensions__tests__C405_C405.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 1
column: 16
fix:
patch:
content: "{1, 2}"
location:
row: 1
@ -28,7 +27,6 @@ expression: checks
row: 2
column: 16
fix:
patch:
content: "{1, 2}"
location:
row: 2
@ -45,7 +43,6 @@ expression: checks
row: 3
column: 12
fix:
patch:
content: set()
location:
row: 3
@ -62,7 +59,6 @@ expression: checks
row: 4
column: 12
fix:
patch:
content: set()
location:
row: 4

4
src/flake8_comprehensions/snapshots/ruff__flake8_comprehensions__tests__C406_C406.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 1
column: 19
fix:
patch:
content: "{1: 2}"
location:
row: 1
@ -28,7 +27,6 @@ expression: checks
row: 2
column: 20
fix:
patch:
content: "{1: 2,}"
location:
row: 2
@ -45,7 +43,6 @@ expression: checks
row: 3
column: 13
fix:
patch:
content: "{}"
location:
row: 3
@ -62,7 +59,6 @@ expression: checks
row: 4
column: 13
fix:
patch:
content: "{}"
location:
row: 4

4
src/flake8_comprehensions/snapshots/ruff__flake8_comprehensions__tests__C408_C408.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 1
column: 11
fix:
patch:
content: ()
location:
row: 1
@ -28,7 +27,6 @@ expression: checks
row: 2
column: 10
fix:
patch:
content: "[]"
location:
row: 2
@ -45,7 +43,6 @@ expression: checks
row: 3
column: 11
fix:
patch:
content: "{}"
location:
row: 3
@ -62,7 +59,6 @@ expression: checks
row: 4
column: 14
fix:
patch:
content: "{\"a\": 1}"
location:
row: 4

5
src/flake8_comprehensions/snapshots/ruff__flake8_comprehensions__tests__C409_C409.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 1
column: 14
fix:
patch:
content: ()
location:
row: 1
@ -28,7 +27,6 @@ expression: checks
row: 2
column: 18
fix:
patch:
content: "(1, 2)"
location:
row: 2
@ -45,7 +43,6 @@ expression: checks
row: 3
column: 18
fix:
patch:
content: "(1, 2)"
location:
row: 3
@ -62,7 +59,6 @@ expression: checks
row: 7
column: 2
fix:
patch:
content: "(\n 1,\n 2\n)"
location:
row: 4
@ -79,7 +75,6 @@ expression: checks
row: 10
column: 1
fix:
patch:
content: "(1, 2)"
location:
row: 8

4
src/flake8_comprehensions/snapshots/ruff__flake8_comprehensions__tests__C410_C410.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 1
column: 17
fix:
patch:
content: "[1, 2]"
location:
row: 1
@ -28,7 +27,6 @@ expression: checks
row: 2
column: 17
fix:
patch:
content: "[1, 2]"
location:
row: 2
@ -45,7 +43,6 @@ expression: checks
row: 3
column: 13
fix:
patch:
content: "[]"
location:
row: 3
@ -62,7 +59,6 @@ expression: checks
row: 4
column: 13
fix:
patch:
content: "[]"
location:
row: 4

1
src/flake8_comprehensions/snapshots/ruff__flake8_comprehensions__tests__C411_C411.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 2
column: 20
fix:
patch:
content: "[i for i in x]"
location:
row: 2

4
src/flake8_comprehensions/snapshots/ruff__flake8_comprehensions__tests__C413_C413.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 3
column: 15
fix:
patch:
content: sorted(x)
location:
row: 3
@ -28,7 +27,6 @@ expression: checks
row: 4
column: 19
fix:
patch:
content: "sorted(x, reverse=True)"
location:
row: 4
@ -45,7 +43,6 @@ expression: checks
row: 5
column: 36
fix:
patch:
content: "sorted(x, key=lambda e: e, reverse=True)"
location:
row: 5
@ -62,7 +59,6 @@ expression: checks
row: 6
column: 33
fix:
patch:
content: "sorted(x, reverse=True)"
location:
row: 6

2
src/flake8_comprehensions/snapshots/ruff__flake8_comprehensions__tests__C416_C416.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 2
column: 14
fix:
patch:
content: list(x)
location:
row: 2
@ -28,7 +27,6 @@ expression: checks
row: 3
column: 14
fix:
patch:
content: set(x)
location:
row: 3

2
src/flake8_print/plugins/print_call.rs
View File

@ -32,7 +32,7 @@ pub fn print_call(checker: &mut Checker, expr: &Expr, func: &Expr) {
&deleted,
) {
Ok(fix) => {
if fix.patch.content.is_empty() || fix.patch.content == "pass" {
if fix.content.is_empty() || fix.content == "pass" {
checker.deletions.insert(context.defined_by);
}
check.amend(fix);

1
src/flake8_print/snapshots/ruff__flake8_print__tests__T201_T201.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 1
column: 22
fix:
patch:
content: ""
location:
row: 1

2
src/flake8_print/snapshots/ruff__flake8_print__tests__T203_T203.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 3
column: 23
fix:
patch:
content: ""
location:
row: 3
@ -26,7 +25,6 @@ expression: checks
row: 8
column: 30
fix:
patch:
content: ""
location:
row: 8

1
src/isort/snapshots/ruff__isort__tests__add_newline_before_comments.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 8
column: 0
fix:
patch:
content: "import os\n\n# This is a comment in the same section, so we need to add one newline.\nimport sys\n\nimport numpy as np\n\n# This is a comment, but it starts a new section, so we don't need to add a newline\n# before it.\nimport leading_prefix\n"
location:
row: 1

1
src/isort/snapshots/ruff__isort__tests__combine_import_froms.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 6
column: 0
fix:
patch:
content: "from collections import (\n AsyncIterable,\n Awaitable,\n ChainMap,\n Collection,\n MutableMapping,\n MutableSequence,\n)\n"
location:
row: 1

1
src/isort/snapshots/ruff__isort__tests__comments.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 26
column: 0
fix:
patch:
content: "import B # Comment 4\n\n# Comment 3a\n# Comment 3b\nimport C\nimport D\n\n# Comment 5\n# Comment 6\nfrom A import (\n a, # Comment 7 # Comment 9\n b, # Comment 10\n c, # Comment 8 # Comment 11\n)\n"
location:
row: 3

1
src/isort/snapshots/ruff__isort__tests__deduplicate_imports.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 5
column: 0
fix:
patch:
content: "import os\nimport os as os1\nimport os as os2\n"
location:
row: 1

1
src/isort/snapshots/ruff__isort__tests__fit_line_length.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 15
column: 0
fix:
patch:
content: " from line_with_88 import aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n from line_with_89 import (\n aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n )\n from line_with_90 import (\n aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n )\n from line_with_91 import (\n aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n )\n from line_with_92 import (\n aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n )\n from line_with_93 import (\n aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n )\n"
location:
row: 7

1
src/isort/snapshots/ruff__isort__tests__fit_line_length_comment.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 5
column: 0
fix:
patch:
content: "import a\n\n# Don't take this comment into account when determining whether the next import can fit on one line.\nfrom b import c\nfrom d import ( # Do take this comment into account when determining whether the next import can fit on one line.\n e,\n)\n"
location:
row: 1

1
src/isort/snapshots/ruff__isort__tests__import_from_after_import.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 3
column: 0
fix:
patch:
content: "import os\nfrom collections import Collection\n"
location:
row: 1

2
src/isort/snapshots/ruff__isort__tests__leading_prefix.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 2
column: 9
fix:
patch:
content: "\nimport os\nimport sys\n"
location:
row: 1
@ -26,7 +25,6 @@ expression: checks
row: 6
column: 13
fix:
patch:
content: "\n import os\n import sys\n"
location:
row: 5

1
src/isort/snapshots/ruff__isort__tests__order_by_type.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 13
column: 0
fix:
patch:
content: "import glob\nimport os\nimport shutil\nimport tempfile\nimport time\nfrom subprocess import PIPE, STDOUT, Popen\n\nimport BAR\nimport bar\nimport FOO\nimport foo\nimport StringIO\nfrom module import BASIC, CONSTANT, Apple, Class, function\n"
location:
row: 1

1
src/isort/snapshots/ruff__isort__tests__order_relative_imports_by_level.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 5
column: 0
fix:
patch:
content: "from ..a import a\nfrom ..b import a\nfrom .a import a\nfrom .b import a\n"
location:
row: 1

1
src/isort/snapshots/ruff__isort__tests__preserve_comment_order.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 12
column: 0
fix:
patch:
content: "import abc\nimport io\n\n# Old MacDonald had a farm,\n# EIEIO\n# And on his farm he had a cow,\n# EIEIO\n# With a moo-moo here and a moo-moo there\n# Here a moo, there a moo, everywhere moo-moo\n# Old MacDonald had a farm,\n# EIEIO\nfrom errno import EIO\n"
location:
row: 1

2
src/isort/snapshots/ruff__isort__tests__preserve_indentation.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 4
column: 0
fix:
patch:
content: " import os\n import sys\n"
location:
row: 2
@ -26,7 +25,6 @@ expression: checks
row: 7
column: 0
fix:
patch:
content: " import os\n import sys\n"
location:
row: 5

1
src/isort/snapshots/ruff__isort__tests__reorder_within_section.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 3
column: 0
fix:
patch:
content: "import os\nimport sys\n"
location:
row: 1

1
src/isort/snapshots/ruff__isort__tests__separate_first_party_imports.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 6
column: 0
fix:
patch:
content: "import os\nimport sys\n\nimport numpy as np\n\nimport leading_prefix\nfrom leading_prefix import Class\n"
location:
row: 1

1
src/isort/snapshots/ruff__isort__tests__separate_future_imports.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 4
column: 0
fix:
patch:
content: "from __future__ import annotations\n\nimport os\nimport sys\n"
location:
row: 1

1
src/isort/snapshots/ruff__isort__tests__separate_local_folder_imports.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 5
column: 0
fix:
patch:
content: "import os\nimport sys\n\nimport leading_prefix\n\nfrom . import leading_prefix\n"
location:
row: 1

1
src/isort/snapshots/ruff__isort__tests__separate_third_party_imports.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 5
column: 0
fix:
patch:
content: "import os\nimport sys\n\nimport numpy as np\nimport pandas as pd\n"
location:
row: 1

1
src/isort/snapshots/ruff__isort__tests__skip.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 11
column: 0
fix:
patch:
content: "import abc\nimport collections\n"
location:
row: 9

1
src/isort/snapshots/ruff__isort__tests__sort_similar_imports.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 27
column: 0
fix:
patch:
content: "import A\nimport a\nimport B\nimport b\nimport x\nimport x as A\nimport x as Y\nimport x as a\nimport x as y\nfrom a import BAD as DEF\nfrom a import B, b\nfrom a import B as A\nfrom a import B as Abc\nfrom a import B as DEF\nfrom a import Boo as DEF\nfrom a import b as a\nfrom a import b as c\nfrom a import b as d\nfrom a import b as x\nfrom a import b as y\nfrom b import C, c\nfrom b import c as d\n"
location:
row: 1

2
src/isort/snapshots/ruff__isort__tests__trailing_suffix.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 2
column: 9
fix:
patch:
content: "import os\nimport sys\n"
location:
row: 1
@ -26,7 +25,6 @@ expression: checks
row: 6
column: 13
fix:
patch:
content: " import os\n import sys\n"
location:
row: 5

10
src/pycodestyle/snapshots/ruff__pycodestyle__tests__E711_E711.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 2
column: 14
fix:
patch:
content: res is None
location:
row: 2
@ -28,7 +27,6 @@ expression: checks
row: 5
column: 14
fix:
patch:
content: res is not None
location:
row: 5
@ -45,7 +43,6 @@ expression: checks
row: 8
column: 7
fix:
patch:
content: None is res
location:
row: 8
@ -62,7 +59,6 @@ expression: checks
row: 11
column: 7
fix:
patch:
content: None is not res
location:
row: 11
@ -79,7 +75,6 @@ expression: checks
row: 14
column: 17
fix:
patch:
content: "res[1] is None"
location:
row: 14
@ -96,7 +91,6 @@ expression: checks
row: 17
column: 17
fix:
patch:
content: "res[1] is not None"
location:
row: 17
@ -113,7 +107,6 @@ expression: checks
row: 20
column: 7
fix:
patch:
content: "None is not res[1]"
location:
row: 20
@ -130,7 +123,6 @@ expression: checks
row: 23
column: 7
fix:
patch:
content: "None is res[1]"
location:
row: 23
@ -147,7 +139,6 @@ expression: checks
row: 26
column: 12
fix:
patch:
content: ""
location:
row: 26
@ -164,7 +155,6 @@ expression: checks
row: 26
column: 20
fix:
patch:
content: x is None is not None
location:
row: 26

11
src/pycodestyle/snapshots/ruff__pycodestyle__tests__E712_E712.py.snap
View File

@ -13,7 +13,6 @@ expression: checks
row: 2
column: 14
fix:
patch:
content: res is True
location:
row: 2
@ -32,7 +31,6 @@ expression: checks
row: 5
column: 15
fix:
patch:
content: res is not False
location:
row: 5
@ -51,7 +49,6 @@ expression: checks
row: 8
column: 7
fix:
patch:
content: True is not res
location:
row: 8
@ -70,7 +67,6 @@ expression: checks
row: 11
column: 8
fix:
patch:
content: False is res
location:
row: 11
@ -89,7 +85,6 @@ expression: checks
row: 14
column: 17
fix:
patch:
content: "res[1] is True"
location:
row: 14
@ -108,7 +103,6 @@ expression: checks
row: 17
column: 18
fix:
patch:
content: "res[1] is not False"
location:
row: 17
@ -127,7 +121,6 @@ expression: checks
row: 20
column: 23
fix:
patch:
content: cond is True
location:
row: 20
@ -146,7 +139,6 @@ expression: checks
row: 20
column: 48
fix:
patch:
content: cond is False
location:
row: 20
@ -165,7 +157,6 @@ expression: checks
row: 22
column: 8
fix:
patch:
content: True is TrueElement
location:
row: 22
@ -184,7 +175,6 @@ expression: checks
row: 25
column: 14
fix:
patch:
content: ""
location:
row: 25
@ -203,7 +193,6 @@ expression: checks
row: 25
column: 23
fix:
patch:
content: res is True is not False
location:
row: 25

5
src/pycodestyle/snapshots/ruff__pycodestyle__tests__E713_E713.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 2
column: 13
fix:
patch:
content: X not in Y
location:
row: 2
@ -26,7 +25,6 @@ expression: checks
row: 5
column: 15
fix:
patch:
content: X.B not in Y
location:
row: 5
@ -42,7 +40,6 @@ expression: checks
row: 8
column: 13
fix:
patch:
content: X not in Y
location:
row: 8
@ -58,7 +55,6 @@ expression: checks
row: 11
column: 28
fix:
patch:
content: Y not in Z
location:
row: 11
@ -74,7 +70,6 @@ expression: checks
row: 14
column: 14
fix:
patch:
content: X not in Y
location:
row: 14

2
src/pycodestyle/snapshots/ruff__pycodestyle__tests__E714_E714.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 2
column: 13
fix:
patch:
content: X is not Y
location:
row: 2
@ -26,7 +25,6 @@ expression: checks
row: 5
column: 15
fix:
patch:
content: X.B is not Y
location:
row: 5

3
src/pycodestyle/snapshots/ruff__pycodestyle__tests__E731_E731.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 2
column: 19
fix:
patch:
content: "def f(x):\n return (2 * x)"
location:
row: 2
@ -26,7 +25,6 @@ expression: checks
row: 4
column: 19
fix:
patch:
content: "def f(x):\n return (2 * x)"
location:
row: 4
@ -42,7 +40,6 @@ expression: checks
row: 7
column: 29
fix:
patch:
content: "def this(y, z):\n return (2 * x)"
location:
row: 7

4
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D201_D.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 137
column: 24
fix:
patch:
content: ""
location:
row: 136
@ -28,7 +27,6 @@ expression: checks
row: 151
column: 37
fix:
patch:
content: ""
location:
row: 150
@ -45,7 +43,6 @@ expression: checks
row: 549
column: 7
fix:
patch:
content: ""
location:
row: 545
@ -62,7 +59,6 @@ expression: checks
row: 571
column: 7
fix:
patch:
content: ""
location:
row: 567

4
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D202_D.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 142
column: 24
fix:
patch:
content: ""
location:
row: 143
@ -28,7 +27,6 @@ expression: checks
row: 151
column: 37
fix:
patch:
content: ""
location:
row: 152
@ -45,7 +43,6 @@ expression: checks
row: 558
column: 7
fix:
patch:
content: ""
location:
row: 559
@ -62,7 +59,6 @@ expression: checks
row: 571
column: 7
fix:
patch:
content: ""
location:
row: 572

3
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D203_D.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 161
column: 32
fix:
patch:
content: "\n"
location:
row: 161
@ -28,7 +27,6 @@ expression: checks
row: 192
column: 45
fix:
patch:
content: "\n"
location:
row: 192
@ -45,7 +43,6 @@ expression: checks
row: 532
column: 7
fix:
patch:
content: "\n"
location:
row: 526

2
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D204_D.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 181
column: 24
fix:
patch:
content: "\n"
location:
row: 182
@ -28,7 +27,6 @@ expression: checks
row: 192
column: 45
fix:
patch:
content: "\n"
location:
row: 193

2
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D205_D.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 203
column: 7
fix:
patch:
content: "\n"
location:
row: 201
@ -26,7 +25,6 @@ expression: checks
row: 215
column: 7
fix:
patch:
content: "\n"
location:
row: 211

2
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D207_D.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 232
column: 0
fix:
patch:
content: " "
location:
row: 232
@ -26,7 +25,6 @@ expression: checks
row: 440
column: 0
fix:
patch:
content: " "
location:
row: 440

3
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D208_D.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 252
column: 0
fix:
patch:
content: " "
location:
row: 252
@ -26,7 +25,6 @@ expression: checks
row: 264
column: 0
fix:
patch:
content: " "
location:
row: 264
@ -42,7 +40,6 @@ expression: checks
row: 272
column: 0
fix:
patch:
content: " "
location:
row: 272

1
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D209_D.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 283
column: 19
fix:
patch:
content: "\n "
location:
row: 283

3
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D210_D.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 288
column: 33
fix:
patch:
content: Whitespace at the end.
location:
row: 288
@ -26,7 +25,6 @@ expression: checks
row: 293
column: 37
fix:
patch:
content: Whitespace at everywhere.
location:
row: 293
@ -42,7 +40,6 @@ expression: checks
row: 302
column: 7
fix:
patch:
content: Whitespace at the beginning.
location:
row: 299

2
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D211_D.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 170
column: 29
fix:
patch:
content: ""
location:
row: 169
@ -28,7 +27,6 @@ expression: checks
row: 181
column: 24
fix:
patch:
content: ""
location:
row: 180

1
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D214_sections.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 141
column: 7
fix:
patch:
content: " "
location:
row: 137

2
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D215_sections.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 153
column: 7
fix:
patch:
content: " "
location:
row: 150
@ -28,7 +27,6 @@ expression: checks
row: 165
column: 7
fix:
patch:
content: " "
location:
row: 164

2
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D405_sections.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 23
column: 7
fix:
patch:
content: Returns
location:
row: 19
@ -28,7 +27,6 @@ expression: checks
row: 221
column: 7
fix:
patch:
content: Short Summary
location:
row: 209

4
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D406_sections.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 36
column: 7
fix:
patch:
content: ""
location:
row: 32
@ -28,7 +27,6 @@ expression: checks
row: 221
column: 7
fix:
patch:
content: ""
location:
row: 218
@ -45,7 +43,6 @@ expression: checks
row: 262
column: 7
fix:
patch:
content: ""
location:
row: 257
@ -62,7 +59,6 @@ expression: checks
row: 262
column: 7
fix:
patch:
content: ""
location:
row: 259

15
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D407_sections.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 47
column: 7
fix:
patch:
content: " -------\n"
location:
row: 45
@ -28,7 +27,6 @@ expression: checks
row: 58
column: 7
fix:
patch:
content: " -------\n"
location:
row: 57
@ -45,7 +43,6 @@ expression: checks
row: 221
column: 7
fix:
patch:
content: " ------\n"
location:
row: 219
@ -62,7 +59,6 @@ expression: checks
row: 262
column: 7
fix:
patch:
content: " -------\n"
location:
row: 258
@ -79,7 +75,6 @@ expression: checks
row: 262
column: 7
fix:
patch:
content: " ------\n"
location:
row: 260
@ -96,7 +91,6 @@ expression: checks
row: 274
column: 7
fix:
patch:
content: " ----\n"
location:
row: 272
@ -113,7 +107,6 @@ expression: checks
row: 292
column: 11
fix:
patch:
content: " ----\n"
location:
row: 289
@ -130,7 +123,6 @@ expression: checks
row: 306
column: 7
fix:
patch:
content: " ----\n"
location:
row: 304
@ -147,7 +139,6 @@ expression: checks
row: 319
column: 11
fix:
patch:
content: " ----\n"
location:
row: 316
@ -164,7 +155,6 @@ expression: checks
row: 330
column: 11
fix:
patch:
content: " ----\n"
location:
row: 328
@ -181,7 +171,6 @@ expression: checks
row: 343
column: 11
fix:
patch:
content: " ----\n"
location:
row: 340
@ -198,7 +187,6 @@ expression: checks
row: 355
column: 11
fix:
patch:
content: " ----\n"
location:
row: 353
@ -215,7 +203,6 @@ expression: checks
row: 367
column: 11
fix:
patch:
content: " ----\n"
location:
row: 365
@ -232,7 +219,6 @@ expression: checks
row: 382
column: 11
fix:
patch:
content: " ----\n"
location:
row: 374
@ -249,7 +235,6 @@ expression: checks
row: 497
column: 11
fix:
patch:
content: " ----\n"
location:
row: 495

1
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D408_sections.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 92
column: 7
fix:
patch:
content: ""
location:
row: 88

2
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D409_sections.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 105
column: 7
fix:
patch:
content: " -------\n"
location:
row: 102
@ -28,7 +27,6 @@ expression: checks
row: 221
column: 7
fix:
patch:
content: " -------\n"
location:
row: 216

2
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D410_sections.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 78
column: 7
fix:
patch:
content: "\n"
location:
row: 71
@ -28,7 +27,6 @@ expression: checks
row: 221
column: 7
fix:
patch:
content: "\n"
location:
row: 218

3
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D411_sections.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 78
column: 7
fix:
patch:
content: "\n"
location:
row: 71
@ -28,7 +27,6 @@ expression: checks
row: 129
column: 7
fix:
patch:
content: "\n"
location:
row: 125
@ -45,7 +43,6 @@ expression: checks
row: 221
column: 7
fix:
patch:
content: "\n"
location:
row: 218

1
src/pydocstyle/snapshots/ruff__pydocstyle__tests__D412_sections.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 221
column: 7
fix:
patch:
content: ""
location:
row: 211

7
src/pyflakes/snapshots/ruff__pyflakes__tests__F401_F401_0.py.snap
View File

@ -13,7 +13,6 @@ expression: checks
row: 2
column: 16
fix:
patch:
content: import os
location:
row: 2
@ -32,7 +31,6 @@ expression: checks
row: 6
column: 15
fix:
patch:
content: "from collections import (\n Counter,\n namedtuple,\n)"
location:
row: 4
@ -51,7 +49,6 @@ expression: checks
row: 12
column: 23
fix:
patch:
content: ""
location:
row: 12
@ -70,7 +67,6 @@ expression: checks
row: 32
column: 17
fix:
patch:
content: ""
location:
row: 32
@ -89,7 +85,6 @@ expression: checks
row: 33
column: 20
fix:
patch:
content: pass
location:
row: 33
@ -108,7 +103,6 @@ expression: checks
row: 37
column: 18
fix:
patch:
content: ""
location:
row: 37
@ -127,7 +121,6 @@ expression: checks
row: 52
column: 21
fix:
patch:
content: pass
location:
row: 52

4
src/pyflakes/snapshots/ruff__pyflakes__tests__F401_F401_5.py.snap
View File

@ -13,7 +13,6 @@ expression: checks
row: 2
column: 17
fix:
patch:
content: ""
location:
row: 2
@ -32,7 +31,6 @@ expression: checks
row: 3
column: 22
fix:
patch:
content: ""
location:
row: 3
@ -51,7 +49,6 @@ expression: checks
row: 4
column: 10
fix:
patch:
content: ""
location:
row: 4
@ -70,7 +67,6 @@ expression: checks
row: 5
column: 15
fix:
patch:
content: ""
location:
row: 5

4
src/pyflakes/snapshots/ruff__pyflakes__tests__F401_F401_6.py.snap
View File

@ -13,7 +13,6 @@ expression: checks
row: 7
column: 39
fix:
patch:
content: ""
location:
row: 7
@ -32,7 +31,6 @@ expression: checks
row: 10
column: 52
fix:
patch:
content: ""
location:
row: 10
@ -51,7 +49,6 @@ expression: checks
row: 17
column: 17
fix:
patch:
content: ""
location:
row: 17
@ -70,7 +67,6 @@ expression: checks
row: 20
column: 35
fix:
patch:
content: ""
location:
row: 20

3
src/pyflakes/snapshots/ruff__pyflakes__tests__F632_F632.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 1
column: 13
fix:
patch:
content: "x == \"abc\""
location:
row: 1
@ -26,7 +25,6 @@ expression: checks
row: 4
column: 15
fix:
patch:
content: 123 != y
location:
row: 4
@ -42,7 +40,6 @@ expression: checks
row: 7
column: 17
fix:
patch:
content: "\"123\" == x"
location:
row: 7

2
src/pyflakes/snapshots/ruff__pyflakes__tests__F901_F901.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 2
column: 24
fix:
patch:
content: NotImplementedError
location:
row: 2
@ -26,7 +25,6 @@ expression: checks
row: 6
column: 24
fix:
patch:
content: NotImplementedError
location:
row: 6

1
src/pyflakes/snapshots/ruff__pyflakes__tests__future_annotations.snap
View File

@ -13,7 +13,6 @@ expression: checks
row: 8
column: 7
fix:
patch:
content: "from models import (\n Fruit,\n)"
location:
row: 6

2
src/pyupgrade/plugins/unnecessary_future_import.rs
View File

@ -71,7 +71,7 @@ pub fn unnecessary_future_import(checker: &mut Checker, stmt: &Stmt, names: &[Lo
&deleted,
) {
Ok(fix) => {
if fix.patch.content.is_empty() || fix.patch.content == "pass" {
if fix.content.is_empty() || fix.content == "pass" {
checker.deletions.insert(context.defined_by);
}
check.amend(fix);

2
src/pyupgrade/plugins/useless_metaclass_type.rs
View File

@ -25,7 +25,7 @@ pub fn useless_metaclass_type(checker: &mut Checker, stmt: &Stmt, value: &Expr,
&deleted,
) {
Ok(fix) => {
if fix.patch.content.is_empty() || fix.patch.content == "pass" {
if fix.content.is_empty() || fix.content == "pass" {
checker.deletions.insert(context.defined_by);
}
check.amend(fix);

2
src/pyupgrade/snapshots/ruff__pyupgrade__tests__U001_U001.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 2
column: 24
fix:
patch:
content: pass
location:
row: 2
@ -26,7 +25,6 @@ expression: checks
row: 6
column: 24
fix:
patch:
content: ""
location:
row: 6

5
src/pyupgrade/snapshots/ruff__pyupgrade__tests__U003_U003.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 1
column: 8
fix:
patch:
content: str
location:
row: 1
@ -28,7 +27,6 @@ expression: checks
row: 2
column: 9
fix:
patch:
content: bytes
location:
row: 2
@ -45,7 +43,6 @@ expression: checks
row: 3
column: 7
fix:
patch:
content: int
location:
row: 3
@ -62,7 +59,6 @@ expression: checks
row: 4
column: 8
fix:
patch:
content: float
location:
row: 4
@ -79,7 +75,6 @@ expression: checks
row: 5
column: 8
fix:
patch:
content: complex
location:
row: 5

20
src/pyupgrade/snapshots/ruff__pyupgrade__tests__U004_U004.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 5
column: 14
fix:
patch:
content: ""
location:
row: 5
@ -28,7 +27,6 @@ expression: checks
row: 10
column: 10
fix:
patch:
content: ""
location:
row: 9
@ -45,7 +43,6 @@ expression: checks
row: 16
column: 10
fix:
patch:
content: ""
location:
row: 15
@ -62,7 +59,6 @@ expression: checks
row: 24
column: 10
fix:
patch:
content: ""
location:
row: 22
@ -79,7 +75,6 @@ expression: checks
row: 31
column: 10
fix:
patch:
content: ""
location:
row: 29
@ -96,7 +91,6 @@ expression: checks
row: 37
column: 10
fix:
patch:
content: ""
location:
row: 36
@ -113,7 +107,6 @@ expression: checks
row: 45
column: 10
fix:
patch:
content: ""
location:
row: 43
@ -130,7 +123,6 @@ expression: checks
row: 53
column: 10
fix:
patch:
content: ""
location:
row: 51
@ -147,7 +139,6 @@ expression: checks
row: 61
column: 10
fix:
patch:
content: ""
location:
row: 59
@ -164,7 +155,6 @@ expression: checks
row: 69
column: 10
fix:
patch:
content: ""
location:
row: 67
@ -181,7 +171,6 @@ expression: checks
row: 75
column: 17
fix:
patch:
content: ""
location:
row: 75
@ -198,7 +187,6 @@ expression: checks
row: 79
column: 14
fix:
patch:
content: ""
location:
row: 79
@ -215,7 +203,6 @@ expression: checks
row: 84
column: 10
fix:
patch:
content: ""
location:
row: 84
@ -232,7 +219,6 @@ expression: checks
row: 92
column: 10
fix:
patch:
content: ""
location:
row: 91
@ -249,7 +235,6 @@ expression: checks
row: 98
column: 10
fix:
patch:
content: ""
location:
row: 98
@ -266,7 +251,6 @@ expression: checks
row: 108
column: 10
fix:
patch:
content: ""
location:
row: 107
@ -283,7 +267,6 @@ expression: checks
row: 114
column: 18
fix:
patch:
content: ""
location:
row: 114
@ -300,7 +283,6 @@ expression: checks
row: 119
column: 10
fix:
patch:
content: ""
location:
row: 118
@ -317,7 +299,6 @@ expression: checks
row: 125
column: 10
fix:
patch:
content: ""
location:
row: 124
@ -334,7 +315,6 @@ expression: checks
row: 131
column: 10
fix:
patch:
content: ""
location:
row: 130

4
src/pyupgrade/snapshots/ruff__pyupgrade__tests__U005_U005.py.snap
View File

@ -13,7 +13,6 @@ expression: checks
row: 6
column: 25
fix:
patch:
content: self.assertEqual
location:
row: 6
@ -32,7 +31,6 @@ expression: checks
row: 7
column: 25
fix:
patch:
content: self.assertEqual
location:
row: 7
@ -51,7 +49,6 @@ expression: checks
row: 9
column: 34
fix:
patch:
content: self.assertAlmostEqual
location:
row: 9
@ -70,7 +67,6 @@ expression: checks
row: 10
column: 35
fix:
patch:
content: self.assertNotRegex
location:
row: 10

4
src/pyupgrade/snapshots/ruff__pyupgrade__tests__U006_U006.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 4
column: 20
fix:
patch:
content: list
location:
row: 4
@ -28,7 +27,6 @@ expression: checks
row: 11
column: 13
fix:
patch:
content: list
location:
row: 11
@ -45,7 +43,6 @@ expression: checks
row: 18
column: 15
fix:
patch:
content: list
location:
row: 18
@ -62,7 +59,6 @@ expression: checks
row: 25
column: 14
fix:
patch:
content: list
location:
row: 25

7
src/pyupgrade/snapshots/ruff__pyupgrade__tests__U007_U007.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 6
column: 22
fix:
patch:
content: str | None
location:
row: 6
@ -26,7 +25,6 @@ expression: checks
row: 10
column: 29
fix:
patch:
content: str | None
location:
row: 10
@ -42,7 +40,6 @@ expression: checks
row: 14
column: 45
fix:
patch:
content: "str | int | Union[float, bytes]"
location:
row: 14
@ -58,7 +55,6 @@ expression: checks
row: 14
column: 44
fix:
patch:
content: float | bytes
location:
row: 14
@ -74,7 +70,6 @@ expression: checks
row: 18
column: 31
fix:
patch:
content: str | int
location:
row: 18
@ -90,7 +85,6 @@ expression: checks
row: 22
column: 33
fix:
patch:
content: str | int
location:
row: 22
@ -106,7 +100,6 @@ expression: checks
row: 26
column: 40
fix:
patch:
content: "(str, int) | float"
location:
row: 26

5
src/pyupgrade/snapshots/ruff__pyupgrade__tests__U008_U008.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 17
column: 35
fix:
patch:
content: super()
location:
row: 17
@ -26,7 +25,6 @@ expression: checks
row: 18
column: 26
fix:
patch:
content: super()
location:
row: 18
@ -42,7 +40,6 @@ expression: checks
row: 22
column: 9
fix:
patch:
content: super()
location:
row: 19
@ -58,7 +55,6 @@ expression: checks
row: 36
column: 28
fix:
patch:
content: super()
location:
row: 36
@ -74,7 +70,6 @@ expression: checks
row: 50
column: 32
fix:
patch:
content: super()
location:
row: 50

1
src/pyupgrade/snapshots/ruff__pyupgrade__tests__U009_U009_0.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 2
column: 0
fix:
patch:
content: ""
location:
row: 1

1
src/pyupgrade/snapshots/ruff__pyupgrade__tests__U009_U009_1.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 3
column: 0
fix:
patch:
content: ""
location:
row: 2

10
src/pyupgrade/snapshots/ruff__pyupgrade__tests__U010_U010.py.snap
View File

@ -13,7 +13,6 @@ expression: checks
row: 1
column: 48
fix:
patch:
content: ""
location:
row: 1
@ -32,7 +31,6 @@ expression: checks
row: 2
column: 55
fix:
patch:
content: ""
location:
row: 2
@ -51,7 +49,6 @@ expression: checks
row: 3
column: 48
fix:
patch:
content: ""
location:
row: 3
@ -69,7 +66,6 @@ expression: checks
row: 4
column: 37
fix:
patch:
content: ""
location:
row: 4
@ -88,7 +84,6 @@ expression: checks
row: 5
column: 53
fix:
patch:
content: ""
location:
row: 5
@ -106,7 +101,6 @@ expression: checks
row: 6
column: 49
fix:
patch:
content: from __future__ import invalid_module
location:
row: 6
@ -124,7 +118,6 @@ expression: checks
row: 9
column: 41
fix:
patch:
content: ""
location:
row: 9
@ -142,7 +135,6 @@ expression: checks
row: 10
column: 37
fix:
patch:
content: pass
location:
row: 10
@ -160,7 +152,6 @@ expression: checks
row: 13
column: 41
fix:
patch:
content: ""
location:
row: 13
@ -178,7 +169,6 @@ expression: checks
row: 14
column: 53
fix:
patch:
content: from __future__ import invalid_module
location:
row: 14

10
src/pyupgrade/snapshots/ruff__pyupgrade__tests__U011_U011_0.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 5
column: 12
fix:
patch:
content: ""
location:
row: 5
@ -26,7 +25,6 @@ expression: checks
row: 11
column: 22
fix:
patch:
content: ""
location:
row: 11
@ -42,7 +40,6 @@ expression: checks
row: 16
column: 24
fix:
patch:
content: ""
location:
row: 16
@ -58,7 +55,6 @@ expression: checks
row: 21
column: 34
fix:
patch:
content: ""
location:
row: 21
@ -74,7 +70,6 @@ expression: checks
row: 28
column: 1
fix:
patch:
content: ""
location:
row: 27
@ -90,7 +85,6 @@ expression: checks
row: 35
column: 1
fix:
patch:
content: ""
location:
row: 33
@ -106,7 +100,6 @@ expression: checks
row: 42
column: 19
fix:
patch:
content: ""
location:
row: 40
@ -122,7 +115,6 @@ expression: checks
row: 51
column: 1
fix:
patch:
content: ""
location:
row: 47
@ -138,7 +130,6 @@ expression: checks
row: 62
column: 1
fix:
patch:
content: ""
location:
row: 56
@ -154,7 +145,6 @@ expression: checks
row: 72
column: 1
fix:
patch:
content: ""
location:
row: 67

15
src/pyupgrade/snapshots/ruff__pyupgrade__tests__U012_U012.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 2
column: 21
fix:
patch:
content: "b\"foo\""
location:
row: 2
@ -26,7 +25,6 @@ expression: checks
row: 3
column: 18
fix:
patch:
content: "b\"foo\""
location:
row: 3
@ -42,7 +40,6 @@ expression: checks
row: 4
column: 14
fix:
patch:
content: "b\"foo\""
location:
row: 4
@ -58,7 +55,6 @@ expression: checks
row: 5
column: 20
fix:
patch:
content: "b\"foo\""
location:
row: 5
@ -74,7 +70,6 @@ expression: checks
row: 6
column: 22
fix:
patch:
content: "b\"foo\""
location:
row: 6
@ -90,7 +85,6 @@ expression: checks
row: 7
column: 30
fix:
patch:
content: "b\"foo\""
location:
row: 7
@ -106,7 +100,6 @@ expression: checks
row: 14
column: 1
fix:
patch:
content: "b\"\"\"\nLorem\n\nIpsum\n\"\"\""
location:
row: 8
@ -122,7 +115,6 @@ expression: checks
row: 26
column: 27
fix:
patch:
content: ""
location:
row: 26
@ -138,7 +130,6 @@ expression: checks
row: 44
column: 31
fix:
patch:
content: ""
location:
row: 44
@ -154,7 +145,6 @@ expression: checks
row: 46
column: 39
fix:
patch:
content: ""
location:
row: 46
@ -170,7 +160,6 @@ expression: checks
row: 48
column: 23
fix:
patch:
content: "br\"fo\\o\""
location:
row: 48
@ -186,7 +175,6 @@ expression: checks
row: 49
column: 22
fix:
patch:
content: "b\"foo\""
location:
row: 49
@ -202,7 +190,6 @@ expression: checks
row: 50
column: 23
fix:
patch:
content: "bR\"fo\\o\""
location:
row: 50
@ -218,7 +205,6 @@ expression: checks
row: 51
column: 22
fix:
patch:
content: "b\"foo\""
location:
row: 51
@ -234,7 +220,6 @@ expression: checks
row: 52
column: 20
fix:
patch:
content: "b\"foo\""
location:
row: 52

10
src/pyupgrade/snapshots/ruff__pyupgrade__tests__U013_U013.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 5
column: 52
fix:
patch:
content: "class MyType1(TypedDict):\n a: int\n b: str"
location:
row: 5
@ -28,7 +27,6 @@ expression: checks
row: 8
column: 50
fix:
patch:
content: "class MyType2(TypedDict):\n a: int\n b: str"
location:
row: 8
@ -45,7 +43,6 @@ expression: checks
row: 11
column: 44
fix:
patch:
content: "class MyType3(TypedDict):\n a: int\n b: str"
location:
row: 11
@ -62,7 +59,6 @@ expression: checks
row: 14
column: 30
fix:
patch:
content: "class MyType4(TypedDict):\n pass"
location:
row: 14
@ -79,7 +75,6 @@ expression: checks
row: 17
column: 46
fix:
patch:
content: "class MyType5(TypedDict):\n a: 'hello'"
location:
row: 17
@ -96,7 +91,6 @@ expression: checks
row: 18
column: 41
fix:
patch:
content: "class MyType6(TypedDict):\n a: 'hello'"
location:
row: 18
@ -113,7 +107,6 @@ expression: checks
row: 21
column: 56
fix:
patch:
content: "class MyType7(TypedDict):\n a: NotRequired[dict]"
location:
row: 21
@ -130,7 +123,6 @@ expression: checks
row: 24
column: 65
fix:
patch:
content: "class MyType8(TypedDict, total=False):\n x: int\n y: int"
location:
row: 24
@ -147,7 +139,6 @@ expression: checks
row: 30
column: 59
fix:
patch:
content: "class MyType10(TypedDict):\n key: Literal['value']"
location:
row: 30
@ -164,7 +155,6 @@ expression: checks
row: 33
column: 53
fix:
patch:
content: "class MyType11(typing.TypedDict):\n key: int"
location:
row: 33

3
src/pyupgrade/snapshots/ruff__pyupgrade__tests__U014_U014.py.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 5
column: 61
fix:
patch:
content: "class NT1(NamedTuple):\n a: int\n b: tuple[str, ...]"
location:
row: 5
@ -28,7 +27,6 @@ expression: checks
row: 12
column: 1
fix:
patch:
content: "class NT2(NamedTuple):\n a: int\n b: str = 'foo'\n c: list[bool] = [True]"
location:
row: 8
@ -45,7 +43,6 @@ expression: checks
row: 15
column: 56
fix:
patch:
content: "class NT3(typing.NamedTuple):\n a: int\n b: str"
location:
row: 15

44
src/pyupgrade/snapshots/ruff__pyupgrade__tests__U015_U015.py.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 1
column: 16
fix:
patch:
content: ""
location:
row: 1
@ -26,7 +25,6 @@ expression: checks
row: 2
column: 17
fix:
patch:
content: ""
location:
row: 2
@ -42,7 +40,6 @@ expression: checks
row: 3
column: 17
fix:
patch:
content: "\"rb\""
location:
row: 3
@ -58,7 +55,6 @@ expression: checks
row: 4
column: 18
fix:
patch:
content: "\"rb\""
location:
row: 4
@ -74,7 +70,6 @@ expression: checks
row: 5
column: 16
fix:
patch:
content: ""
location:
row: 5
@ -90,7 +85,6 @@ expression: checks
row: 6
column: 17
fix:
patch:
content: ""
location:
row: 6
@ -106,7 +100,6 @@ expression: checks
row: 7
column: 32
fix:
patch:
content: ""
location:
row: 7
@ -122,7 +115,6 @@ expression: checks
row: 8
column: 15
fix:
patch:
content: "\"w\""
location:
row: 8
@ -138,7 +130,6 @@ expression: checks
row: 10
column: 21
fix:
patch:
content: ""
location:
row: 10
@ -154,7 +145,6 @@ expression: checks
row: 12
column: 22
fix:
patch:
content: ""
location:
row: 12
@ -170,7 +160,6 @@ expression: checks
row: 14
column: 22
fix:
patch:
content: "\"rb\""
location:
row: 14
@ -186,7 +175,6 @@ expression: checks
row: 16
column: 23
fix:
patch:
content: "\"rb\""
location:
row: 16
@ -202,7 +190,6 @@ expression: checks
row: 18
column: 21
fix:
patch:
content: ""
location:
row: 18
@ -218,7 +205,6 @@ expression: checks
row: 20
column: 22
fix:
patch:
content: ""
location:
row: 20
@ -234,7 +220,6 @@ expression: checks
row: 22
column: 39
fix:
patch:
content: ""
location:
row: 22
@ -250,7 +235,6 @@ expression: checks
row: 24
column: 22
fix:
patch:
content: "\"w\""
location:
row: 24
@ -266,7 +250,6 @@ expression: checks
row: 27
column: 27
fix:
patch:
content: ""
location:
row: 27
@ -282,7 +265,6 @@ expression: checks
row: 28
column: 28
fix:
patch:
content: "\"rb\""
location:
row: 28
@ -298,7 +280,6 @@ expression: checks
row: 30
column: 32
fix:
patch:
content: ""
location:
row: 30
@ -314,7 +295,6 @@ expression: checks
row: 32
column: 33
fix:
patch:
content: "\"rb\""
location:
row: 32
@ -330,7 +310,6 @@ expression: checks
row: 35
column: 21
fix:
patch:
content: ""
location:
row: 35
@ -346,7 +325,6 @@ expression: checks
row: 35
column: 45
fix:
patch:
content: ""
location:
row: 35
@ -362,7 +340,6 @@ expression: checks
row: 37
column: 22
fix:
patch:
content: "\"rb\""
location:
row: 37
@ -378,7 +355,6 @@ expression: checks
row: 37
column: 47
fix:
patch:
content: "\"rb\""
location:
row: 37
@ -394,7 +370,6 @@ expression: checks
row: 40
column: 21
fix:
patch:
content: ""
location:
row: 40
@ -410,7 +385,6 @@ expression: checks
row: 41
column: 26
fix:
patch:
content: ""
location:
row: 41
@ -426,7 +400,6 @@ expression: checks
row: 42
column: 26
fix:
patch:
content: ""
location:
row: 42
@ -442,7 +415,6 @@ expression: checks
row: 44
column: 26
fix:
patch:
content: ""
location:
row: 44
@ -458,7 +430,6 @@ expression: checks
row: 46
column: 31
fix:
patch:
content: ""
location:
row: 46
@ -474,7 +445,6 @@ expression: checks
row: 48
column: 31
fix:
patch:
content: ""
location:
row: 48
@ -490,7 +460,6 @@ expression: checks
row: 51
column: 22
fix:
patch:
content: "\"rb\""
location:
row: 51
@ -506,7 +475,6 @@ expression: checks
row: 52
column: 27
fix:
patch:
content: "\"rb\""
location:
row: 52
@ -522,7 +490,6 @@ expression: checks
row: 53
column: 27
fix:
patch:
content: "\"rb\""
location:
row: 53
@ -538,7 +505,6 @@ expression: checks
row: 55
column: 27
fix:
patch:
content: "\"rb\""
location:
row: 55
@ -554,7 +520,6 @@ expression: checks
row: 57
column: 32
fix:
patch:
content: "\"rb\""
location:
row: 57
@ -570,7 +535,6 @@ expression: checks
row: 59
column: 32
fix:
patch:
content: "\"rb\""
location:
row: 59
@ -586,7 +550,6 @@ expression: checks
row: 62
column: 110
fix:
patch:
content: ""
location:
row: 62
@ -602,7 +565,6 @@ expression: checks
row: 63
column: 110
fix:
patch:
content: ""
location:
row: 63
@ -618,7 +580,6 @@ expression: checks
row: 64
column: 110
fix:
patch:
content: ""
location:
row: 64
@ -634,7 +595,6 @@ expression: checks
row: 65
column: 110
fix:
patch:
content: ""
location:
row: 65
@ -650,7 +610,6 @@ expression: checks
row: 67
column: 111
fix:
patch:
content: "\"rb\""
location:
row: 67
@ -666,7 +625,6 @@ expression: checks
row: 68
column: 111
fix:
patch:
content: "\"rb\""
location:
row: 68
@ -682,7 +640,6 @@ expression: checks
row: 69
column: 111
fix:
patch:
content: "\"rb\""
location:
row: 69
@ -698,7 +655,6 @@ expression: checks
row: 70
column: 111
fix:
patch:
content: "\"rb\""
location:
row: 70

1
src/pyupgrade/snapshots/ruff__pyupgrade__tests__future_annotations_pep_585_p37.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 34
column: 21
fix:
patch:
content: list
location:
row: 34

2
src/pyupgrade/snapshots/ruff__pyupgrade__tests__future_annotations_pep_585_py310.snap
View File

@ -11,7 +11,6 @@ expression: checks
row: 34
column: 21
fix:
patch:
content: list
location:
row: 34
@ -28,7 +27,6 @@ expression: checks
row: 35
column: 12
fix:
patch:
content: list
location:
row: 35

1
src/pyupgrade/snapshots/ruff__pyupgrade__tests__future_annotations_pep_604_p37.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 40
column: 16
fix:
patch:
content: int | None
location:
row: 40

1
src/pyupgrade/snapshots/ruff__pyupgrade__tests__future_annotations_pep_604_py310.snap
View File

@ -10,7 +10,6 @@ expression: checks
row: 40
column: 16
fix:
patch:
content: int | None
location:
row: 40

1
src/rules/snapshots/ruff__rules__tests__RUF001_RUF001.py.snap
View File

@ -13,7 +13,6 @@ expression: checks
row: 1
column: 6
fix:
patch:
content: B
location:
row: 1

1
src/rules/snapshots/ruff__rules__tests__RUF002_RUF002.py.snap
View File

@ -13,7 +13,6 @@ expression: checks
row: 5
column: 56
fix:
patch:
content: )
location:
row: 5

Some files were not shown because too many files have changed in this diff Show More