snapshot conflict resolution

astral-sh · Dec 25, 2024 · 0e23922 · 0e23922
1 parent b17ff76
commit 0e23922
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 12 deletions.
diff --git a/...rguments/snapshots/ruff_linter__rules__flake8_unused_arguments__tests__ARG002_ARG.py.snap b/...rguments/snapshots/ruff_linter__rules__flake8_unused_arguments__tests__ARG002_ARG.py.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_unused_arguments/mod.rs
-snapshot_kind: text
 ---
 ARG.py:37:17: ARG002 Unused method argument: `x`
    |
@@ -29,11 +28,41 @@ ARG.py:43:16: ARG002 Unused method argument: `x`
 44 |         print("Hello, world!")
    |
 
-ARG.py:195:24: ARG002 Unused method argument: `x`
+ARG.py:58:17: ARG002 Unused method argument: `x`
+   |
+56 |         print("Hello, world!")
+57 | 
+58 |     def f(self, x):
+   |                 ^ ARG002
+59 |         msg[0] = "..."
+60 |         raise NotImplementedError(msg)
+   |
+
+ARG.py:62:17: ARG002 Unused method argument: `x`
+   |
+60 |         raise NotImplementedError(msg)
+61 | 
+62 |     def f(self, x):
+   |                 ^ ARG002
+63 |         msg = "..."
+64 |         raise NotImplementedError(foo)
+   |
+
+ARG.py:66:17: ARG002 Unused method argument: `x`
+   |
+64 |         raise NotImplementedError(foo)
+65 | 
+66 |     def f(self, x):
+   |                 ^ ARG002
+67 |         msg = "..."
+68 |         raise NotImplementedError("must use msg")
+   |
+
+ARG.py:216:24: ARG002 Unused method argument: `x`
     |
-193 |         print("Hello, world!")
-194 | 
-195 |     def __init__(self, x) -> None:
+214 |         print("Hello, world!")
+215 | 
+216 |     def __init__(self, x) -> None:
     |                        ^ ARG002
-196 |         print("Hello, world!")
+217 |         print("Hello, world!")
     |
diff --git a/...rguments/snapshots/ruff_linter__rules__flake8_unused_arguments__tests__ARG004_ARG.py.snap b/...rguments/snapshots/ruff_linter__rules__flake8_unused_arguments__tests__ARG004_ARG.py.snap
@@ -1,6 +1,5 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_unused_arguments/mod.rs
-snapshot_kind: text
 ---
 ARG.py:51:11: ARG004 Unused static method argument: `cls`
    |
@@ -26,11 +25,11 @@ ARG.py:55:11: ARG004 Unused static method argument: `x`
 56 |         print("Hello, world!")
    |
 
-ARG.py:192:22: ARG004 Unused static method argument: `x`
+ARG.py:213:22: ARG004 Unused static method argument: `x`
     |
-190 | ###
-191 | class C:
-192 |     def __new__(cls, x):
+211 | ###
+212 | class C:
+213 |     def __new__(cls, x):
     |                      ^ ARG004
-193 |         print("Hello, world!")
+214 |         print("Hello, world!")
     |