Remove RustPython fork (#523)

astral-sh · Oct 30, 2022 · 2415d73 · 2415d73
1 parent b060ae2
commit 2415d73
Show file tree

Hide file tree

Showing 173 changed files with 1,557 additions and 1,542 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,9 +26,9 @@ once_cell = { version = "1.13.1" }
 path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] }
 rayon = { version = "1.5.3" }
 regex = { version = "1.6.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/charliermarsh/RustPython.git", rev = "1b253a12705f84972cd76e8dc1cdaaccb233e5a5" }
-rustpython-common = { git = "https://github.com/charliermarsh/RustPython.git", rev = "1b253a12705f84972cd76e8dc1cdaaccb233e5a5" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/charliermarsh/RustPython.git", rev = "1b253a12705f84972cd76e8dc1cdaaccb233e5a5" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "77b821a1941019fe34f73ce17cea013ae1b98fd0" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "77b821a1941019fe34f73ce17cea013ae1b98fd0" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "77b821a1941019fe34f73ce17cea013ae1b98fd0" }
 serde = { version = "1.0.143", features = ["derive"] }
 serde_json = { version = "1.0.83" }
 strum = { version = "0.24.1", features = ["strum_macros"] }

diff --git a/foo.py b/foo.py
@@ -0,0 +1,5 @@
+def function_with_nesting():
+    """Foo bar documentation."""
+    @overload
+    def nested_overloaded_func(a: int) -> str:
+        ...
diff --git a/src/ast/helpers.rs b/src/ast/helpers.rs
@@ -137,7 +137,7 @@ pub fn to_absolute(relative: &Location, base: &Location) -> Location {
     if relative.row() == 1 {
         Location::new(
             relative.row() + base.row() - 1,
-            relative.column() + base.column() - 1,
+            relative.column() + base.column(),
         )
     } else {
         Location::new(relative.row() + base.row() - 1, relative.column())

diff --git a/src/autofix/fixer.rs b/src/autofix/fixer.rs
@@ -69,19 +69,18 @@ fn apply_fixes<'a>(fixes: impl Iterator<Item = &'a mut Fix>, contents: &str) ->
 
         if fix.patch.location.row() > last_pos.row() {
             if last_pos.row() > 0 || last_pos.column() > 0 {
-                output.push_str(&lines[last_pos.row() - 1][last_pos.column() - 1..]);
+                output.push_str(&lines[last_pos.row() - 1][last_pos.column()..]);
                 output.push('\n');
             }
             for line in &lines[last_pos.row()..fix.patch.location.row() - 1] {
                 output.push_str(line);
                 output.push('\n');
             }
-            output
-                .push_str(&lines[fix.patch.location.row() - 1][..fix.patch.location.column() - 1]);
+            output.push_str(&lines[fix.patch.location.row() - 1][..fix.patch.location.column()]);
             output.push_str(&fix.patch.content);
         } else {
             output.push_str(
-                &lines[last_pos.row() - 1][last_pos.column() - 1..fix.patch.location.column() - 1],
+                &lines[last_pos.row() - 1][last_pos.column()..fix.patch.location.column()],
             );
             output.push_str(&fix.patch.content);
         }
@@ -95,7 +94,7 @@ fn apply_fixes<'a>(fixes: impl Iterator<Item = &'a mut Fix>, contents: &str) ->
         && (last_pos.row() - 1) < lines.len()
         && (last_pos.row() > 0 || last_pos.column() > 0)
     {
-        output.push_str(&lines[last_pos.row() - 1][last_pos.column() - 1..]);
+        output.push_str(&lines[last_pos.row() - 1][last_pos.column()..]);
         output.push('\n');
     }
     if last_pos.row() < lines.len() {
@@ -133,8 +132,8 @@ mod tests {
         let mut fixes = vec![Fix {
             patch: Patch {
                 content: "Bar".to_string(),
-                location: Location::new(1, 9),
-                end_location: Location::new(1, 15),
+                location: Location::new(1, 8),
+                end_location: Location::new(1, 14),
             },
             applied: false,
         }];
@@ -159,8 +158,8 @@ mod tests {
         let mut fixes = vec![Fix {
             patch: Patch {
                 content: "".to_string(),
-                location: Location::new(1, 8),
-                end_location: Location::new(1, 16),
+                location: Location::new(1, 7),
+                end_location: Location::new(1, 15),
             },
             applied: false,
         }];
@@ -186,16 +185,16 @@ mod tests {
             Fix {
                 patch: Patch {
                     content: "".to_string(),
-                    location: Location::new(1, 8),
-                    end_location: Location::new(1, 17),
+                    location: Location::new(1, 7),
+                    end_location: Location::new(1, 16),
                 },
                 applied: false,
             },
             Fix {
                 patch: Patch {
                     content: "".to_string(),
-                    location: Location::new(1, 17),
-                    end_location: Location::new(1, 24),
+                    location: Location::new(1, 16),
+                    end_location: Location::new(1, 23),
                 },
                 applied: false,
             },
@@ -222,16 +221,16 @@ mod tests {
             Fix {
                 patch: Patch {
                     content: "".to_string(),
-                    location: Location::new(1, 8),
-                    end_location: Location::new(1, 16),
+                    location: Location::new(1, 7),
+                    end_location: Location::new(1, 15),
                 },
                 applied: false,
             },
             Fix {
                 patch: Patch {
                     content: "ignored".to_string(),
-                    location: Location::new(1, 10),
-                    end_location: Location::new(1, 12),
+                    location: Location::new(1, 9),
+                    end_location: Location::new(1, 11),
                 },
                 applied: false,
             },

diff --git a/src/autofix/helpers.rs b/src/autofix/helpers.rs
@@ -82,8 +82,8 @@ pub fn remove_stmt(stmt: &Stmt, parent: Option<&Stmt>, deleted: &[&Stmt]) -> Res
         // Otherwise, nuke the entire line.
         // TODO(charlie): This logic assumes that there are no multi-statement physical lines.
         Ok(Fix::deletion(
-            Location::new(stmt.location.row(), 1),
-            Location::new(stmt.end_location.unwrap().row() + 1, 1),
+            Location::new(stmt.location.row(), 0),
+            Location::new(stmt.end_location.unwrap().row() + 1, 0),
         ))
     }
 }
diff --git a/src/check_ast.rs b/src/check_ast.rs
@@ -387,7 +387,7 @@ where
             }
             StmtKind::Import { names } => {
                 if self.settings.enabled.contains(&CheckCode::E402) {
-                    if self.seen_import_boundary && stmt.location.column() == 1 {
+                    if self.seen_import_boundary && stmt.location.column() == 0 {
                         self.checks.push(Check::new(
                             CheckKind::ModuleImportNotAtTopOfFile,
                             self.locate_check(Range::from_located(stmt)),
@@ -493,7 +493,7 @@ where
                 level,
             } => {
                 if self.settings.enabled.contains(&CheckCode::E402) {
-                    if self.seen_import_boundary && stmt.location.column() == 1 {
+                    if self.seen_import_boundary && stmt.location.column() == 0 {
                         self.checks.push(Check::new(
                             CheckKind::ModuleImportNotAtTopOfFile,
                             self.locate_check(Range::from_located(stmt)),

diff --git a/src/check_lines.rs b/src/check_lines.rs
@@ -94,8 +94,8 @@ pub fn check_lines(
                 let check = Check::new(
                     CheckKind::LineTooLong(line_length, settings.line_length),
                     Range {
-                        location: Location::new(lineno + 1, 1),
-                        end_location: Location::new(lineno + 1, line_length + 1),
+                        location: Location::new(lineno + 1, 0),
+                        end_location: Location::new(lineno + 1, line_length),
                     },
                 );
 
@@ -164,14 +164,14 @@ pub fn check_lines(
                         let mut check = Check::new(
                             CheckKind::UnusedNOQA(None),
                             Range {
-                                location: Location::new(row + 1, start + 1),
-                                end_location: Location::new(row + 1, end + 1),
+                                location: Location::new(row + 1, start),
+                                end_location: Location::new(row + 1, end),
                             },
                         );
                         if autofix.patch() {
                             check.amend(Fix::deletion(
-                                Location::new(row + 1, start + 1),
-                                Location::new(row + 1, lines[row].chars().count() + 1),
+                                Location::new(row + 1, start),
+                                Location::new(row + 1, lines[row].chars().count()),
                             ));
                         }
                         line_checks.push(check);
@@ -192,21 +192,21 @@ pub fn check_lines(
                         let mut check = Check::new(
                             CheckKind::UnusedNOQA(Some(invalid_codes)),
                             Range {
-                                location: Location::new(row + 1, start + 1),
-                                end_location: Location::new(row + 1, end + 1),
+                                location: Location::new(row + 1, start),
+                                end_location: Location::new(row + 1, end),
                             },
                         );
                         if autofix.patch() {
                             if valid_codes.is_empty() {
                                 check.amend(Fix::deletion(
-                                    Location::new(row + 1, start + 1),
-                                    Location::new(row + 1, lines[row].chars().count() + 1),
+                                    Location::new(row + 1, start),
+                                    Location::new(row + 1, lines[row].chars().count()),
                                 ));
                             } else {
                                 check.amend(Fix::replacement(
                                     format!("  # noqa: {}", valid_codes.join(", ")),
-                                    Location::new(row + 1, start + 1),
-                                    Location::new(row + 1, lines[row].chars().count() + 1),
+                                    Location::new(row + 1, start),
+                                    Location::new(row + 1, lines[row].chars().count()),
                                 ));
                             }
                         }

diff --git a/src/docstrings/helpers.rs b/src/docstrings/helpers.rs
@@ -28,7 +28,7 @@ pub fn leading_space(line: &str) -> String {
 pub fn indentation<'a>(checker: &'a Checker, docstring: &Expr) -> &'a str {
     let range = Range::from_located(docstring);
     checker.locator.slice_source_code_range(&Range {
-        location: Location::new(range.location.row(), 1),
+        location: Location::new(range.location.row(), 0),
         end_location: Location::new(range.location.row(), range.location.column()),
     })
 }

diff --git a/.../snapshots/ruff__flake8_quotes__checks__tests__double_docstring_docstring_doubles.py.snap b/.../snapshots/ruff__flake8_quotes__checks__tests__double_docstring_docstring_doubles.py.snap
@@ -6,45 +6,45 @@ expression: checks
     BadQuotesMultilineString: single
   location:
     row: 5
-    column: 1
+    column: 0
   end_location:
     row: 7
-    column: 4
+    column: 3
   fix: ~
 - kind:
     BadQuotesMultilineString: single
   location:
     row: 16
-    column: 5
+    column: 4
   end_location:
     row: 18
-    column: 8
+    column: 7
   fix: ~
 - kind:
     BadQuotesMultilineString: single
   location:
     row: 21
-    column: 21
+    column: 20
   end_location:
     row: 22
-    column: 38
+    column: 37
   fix: ~
 - kind:
     BadQuotesMultilineString: single
   location:
     row: 30
-    column: 9
+    column: 8
   end_location:
     row: 32
-    column: 12
+    column: 11
   fix: ~
 - kind:
     BadQuotesMultilineString: single
   location:
     row: 35
-    column: 13
+    column: 12
   end_location:
     row: 37
-    column: 16
+    column: 15
   fix: ~
 
diff --git a/...hots/ruff__flake8_quotes__checks__tests__double_docstring_docstring_doubles_class.py.snap b/...hots/ruff__flake8_quotes__checks__tests__double_docstring_docstring_doubles_class.py.snap
@@ -6,18 +6,18 @@ expression: checks
     BadQuotesMultilineString: single
   location:
     row: 3
-    column: 5
+    column: 4
   end_location:
     row: 3
-    column: 28
+    column: 27
   fix: ~
 - kind:
     BadQuotesMultilineString: single
   location:
     row: 5
-    column: 23
+    column: 22
   end_location:
     row: 5
-    column: 44
+    column: 43
   fix: ~
 
diff --git a/...s/ruff__flake8_quotes__checks__tests__double_docstring_docstring_doubles_function.py.snap b/...s/ruff__flake8_quotes__checks__tests__double_docstring_docstring_doubles_function.py.snap
@@ -6,45 +6,45 @@ expression: checks
     BadQuotesMultilineString: single
   location:
     row: 3
-    column: 5
+    column: 4
   end_location:
     row: 3
-    column: 27
+    column: 26
   fix: ~
 - kind:
     BadQuotesMultilineString: single
   location:
     row: 11
-    column: 5
+    column: 4
   end_location:
     row: 11
-    column: 27
+    column: 26
   fix: ~
 - kind:
     BadQuotesMultilineString: single
   location:
     row: 15
-    column: 39
+    column: 38
   end_location:
     row: 17
-    column: 4
+    column: 3
   fix: ~
 - kind:
     BadQuotesMultilineString: single
   location:
     row: 17
-    column: 5
+    column: 4
   end_location:
     row: 17
-    column: 20
+    column: 19
   fix: ~
 - kind:
     BadQuotesMultilineString: single
   location:
     row: 21
-    column: 5
+    column: 4
   end_location:
     row: 21
-    column: 28
+    column: 27
   fix: ~