Use nextest to run tests in CI

.editorconfig

@@ -10,7 +10,7 @@ indent_style = space
 insert_final_newline = true
 indent_size = 2
 
-[*.{rs,py,pyi}]
+[*.{rs,py}]
 indent_size = 4
 
 [*.snap]

.github/dependabot.yml

@@ -4,10 +4,8 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-    labels: ["internal"]
-
-  - package-ecosystem: "cargo"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    labels: ["internal"]
+      day: "monday"
+      time: "12:00"
+      timezone: "America/New_York"
+    commit-message:
+      prefix: "ci(deps)"

.github/workflows/ci.yaml

@@ -26,11 +26,11 @@ jobs:
       linter: ${{ steps.changed.outputs.linter_any_changed }}
       formatter: ${{ steps.changed.outputs.formatter_any_changed }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - uses: tj-actions/changed-files@v39
+      - uses: tj-actions/changed-files@v37
         id: changed
         with:
           files_yaml: |
@@ -62,7 +62,7 @@ jobs:
     name: "cargo fmt"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup component add rustfmt
       - run: cargo fmt --all --check
@@ -71,7 +71,7 @@ jobs:
     name: "cargo clippy"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: |
           rustup component add clippy
@@ -89,18 +89,24 @@ jobs:
     runs-on: ${{ matrix.os }}
     name: "cargo test | ${{ matrix.os }}"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install cargo insta"
         uses: taiki-e/install-action@v2
         with:
           tool: cargo-insta
+      - name: "Install cargo nextest"
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-nextest
       - run: pip install black[d]==23.1.0
       - uses: Swatinem/rust-cache@v2
       - name: "Run tests (Ubuntu)"
         if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: cargo insta test --all --all-features --unreferenced reject
+        run: >
+          cargo insta test --all --all-features --unreferenced reject --test-runner nextest
+          -- --status-level skip --failure-output immediate-final --no-fail-fast --all-targets
       - name: "Run tests (Windows)"
         if: ${{ matrix.os == 'windows-latest' }}
         shell: bash
@@ -125,7 +131,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "cargo fuzz"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - uses: Swatinem/rust-cache@v2
@@ -141,7 +147,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "cargo test (wasm)"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
       - uses: actions/setup-node@v3
@@ -160,7 +166,7 @@ jobs:
     name: "test scripts"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup component add rustfmt
       - uses: Swatinem/rust-cache@v2
@@ -182,7 +188,7 @@ jobs:
     # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
     if: github.event_name == 'pull_request' && needs.determine_changes.outputs.linter == 'true'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -227,7 +233,7 @@ jobs:
     name: "cargo udeps"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install nightly Rust toolchain"
         # Only pinned to make caching work, update freely
         run: rustup toolchain install nightly-2023-06-08
@@ -241,7 +247,7 @@ jobs:
     name: "python package"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -265,7 +271,7 @@ jobs:
     name: "pre-commit"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -295,7 +301,7 @@ jobs:
     env:
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
@@ -330,7 +336,7 @@ jobs:
     needs: determine_changes
     if: needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Cache rust"
@@ -346,7 +352,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Branch"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: "Install Rust toolchain"
         run: rustup show

.github/workflows/docs.yaml

@@ -12,7 +12,7 @@ jobs:
       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
@@ -40,7 +40,7 @@ jobs:
         run: mkdocs build --strict -f mkdocs.generated.yml
       - name: "Deploy to Cloudflare Pages"
         if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@v3.1.1
+        uses: cloudflare/wrangler-action@v3.1.0
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}

.github/workflows/flake8-to-ruff.yaml

@@ -19,7 +19,7 @@ jobs:
   macos-x86_64:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -42,7 +42,7 @@ jobs:
   macos-universal:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -68,7 +68,7 @@ jobs:
       matrix:
         target: [x64, x86]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -96,7 +96,7 @@ jobs:
       matrix:
         target: [x86_64, i686]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -123,7 +123,7 @@ jobs:
       matrix:
         target: [aarch64, armv7, s390x, ppc64le, ppc64]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -160,7 +160,7 @@ jobs:
           - x86_64-unknown-linux-musl
           - i686-unknown-linux-musl
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -196,7 +196,7 @@ jobs:
           - target: armv7-unknown-linux-musleabihf
             arch: armv7
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}

.github/workflows/playground.yaml

@@ -17,7 +17,7 @@ jobs:
     env:
       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
       - uses: actions/setup-node@v3
@@ -40,7 +40,7 @@ jobs:
         working-directory: playground
       - name: "Deploy to Cloudflare Pages"
         if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@v3.1.1
+        uses: cloudflare/wrangler-action@v3.1.0
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}

.github/workflows/release.yaml

@@ -30,7 +30,7 @@ jobs:
   sdist:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -56,7 +56,7 @@ jobs:
   macos-x86_64:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -94,7 +94,7 @@ jobs:
   macos-universal:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -140,7 +140,7 @@ jobs:
           - target: aarch64-pc-windows-msvc
             arch: x64
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -186,7 +186,7 @@ jobs:
           - x86_64-unknown-linux-gnu
           - i686-unknown-linux-gnu
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -243,7 +243,7 @@ jobs:
             arch: ppc64
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -296,7 +296,7 @@ jobs:
           - x86_64-unknown-linux-musl
           - i686-unknown-linux-musl
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -350,7 +350,7 @@ jobs:
             arch: armv7
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -398,7 +398,7 @@ jobs:
     # If you don't set an input tag, it's a dry run (no uploads).
     if: ${{ inputs.tag }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Check tag consistency
         run: |
           version=$(grep "version = " pyproject.toml | sed -e 's/version = "\(.*\)"/\1/g')
@@ -464,7 +464,7 @@ jobs:
       # For git tag
       contents: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: git tag
         run: |
           git config user.email "hey@astral.sh"

.pre-commit-config.yaml

@@ -23,6 +23,8 @@ repos:
       - id: mdformat
         additional_dependencies:
           - mdformat-mkdocs
+          - mdformat-black
+          - black==23.1.0 # Must be the latest version of Black
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.33.0

BREAKING_CHANGES.md

@@ -1,20 +1,5 @@
 # Breaking Changes
 
-## 0.0.288
-
-### Remove support for emoji identifiers ([#7212](https://github.com/astral-sh/ruff/pull/7212))
-
-Previously, Ruff supported the non-standard compliant emoji identifiers e.g. `📦 = 1`.
-We decided to remove this non-standard language extension, and Ruff now reports syntax errors for emoji identifiers in your code, the same as CPython.
-
-### Improved GitLab fingerprints ([#7203](https://github.com/astral-sh/ruff/pull/7203))
-
-GitLab uses fingerprints to identify new, existing, or fixed violations. Previously, Ruff included the violation's position in the fingerprint. Using the location has the downside that changing any code before the violation causes the fingerprint to change, resulting in GitLab reporting one fixed and one new violation even though it is a pre-existing violation.
-
-Ruff now uses a more stable location-agnostic fingerprint to minimize that existing violations incorrectly get marked as fixed and re-reported as new violations.
-
-Expect GitLab to report each pre-existing violation in your project as fixed and a new violation in your Ruff upgrade PR.
-
 ## 0.0.283 / 0.284
 
 ### The target Python version now defaults to 3.8 instead of 3.10 ([#6397](https://github.com/astral-sh/ruff/pull/6397))

CONTRIBUTING.md

@@ -129,7 +129,6 @@ At time of writing, the repository includes the following crates:
     intermediate representation. The backend for `ruff_python_formatter`.
 - `crates/ruff_index`: library crate inspired by `rustc_index`.
 - `crates/ruff_macros`: proc macro crate containing macros used by Ruff.
-- `crates/ruff_notebook`: library crate for parsing and manipulating Jupyter notebooks.
 - `crates/ruff_python_ast`: library crate containing Python-specific AST types and utilities.
 - `crates/ruff_python_codegen`: library crate containing utilities for generating Python source code.
 - `crates/ruff_python_formatter`: library crate implementing the Python formatter. Emits an

Cargo.toml

@@ -40,7 +40,6 @@ serde_json = { version = "1.0.93" }
 shellexpand = { version = "3.0.0" }
 similar = { version = "2.2.1", features = ["inline"] }
 smallvec = { version = "1.10.0" }
-static_assertions = "1.1.0"
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
 syn = { version = "2.0.15" }
@@ -50,13 +49,12 @@ toml = { version = "0.7.2" }
 tracing = "0.1.37"
 tracing-indicatif = "0.3.4"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-unicode-ident = "1.0.11"
 unicode-width = "0.1.10"
 uuid = { version = "1.4.1", features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
 wsl = { version = "0.1.0" }
 
 # v1.0.1
-libcst = { version = "0.1.0", default-features = false }
+libcst = { git = "https://github.com/Instagram/LibCST.git", rev = "3cacca1a1029f05707e50703b49fe3dd860aa839", default-features = false }
 
 [profile.release]
 lto = "fat"

README.md

@@ -140,7 +140,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.0.288
+  rev: v0.0.286
   hooks:
     - id: ruff
 ```
@@ -398,7 +398,6 @@ Ruff is used by a number of major open-source projects and companies, including:
 - [Pydantic](https://github.com/pydantic/pydantic)
 - [Pylint](https://github.com/PyCQA/pylint)
 - [Reflex](https://github.com/reflex-dev/reflex)
-- [Rippling](https://rippling.com)
 - [Robyn](https://github.com/sansyrox/robyn)
 - Scale AI ([Launch SDK](https://github.com/scaleapi/launch-python-client))
 - Snowflake ([SnowCLI](https://github.com/Snowflake-Labs/snowcli))

crates/flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.288"
+version = "0.0.286"
 description = """
 Convert Flake8 configuration files to Ruff configuration files.
 """

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.0.288"
+version = "0.0.286"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -18,7 +18,6 @@ name = "ruff"
 ruff_cache = { path = "../ruff_cache" }
 ruff_diagnostics = { path = "../ruff_diagnostics", features = ["serde"] }
 ruff_index = { path = "../ruff_index" }
-ruff_notebook = { path = "../ruff_notebook" }
 ruff_macros = { path = "../ruff_macros" }
 ruff_python_ast = { path = "../ruff_python_ast", features = ["serde"] }
 ruff_python_codegen = { path = "../ruff_python_codegen" }
@@ -65,15 +64,17 @@ schemars = { workspace = true, optional = true }
 semver = { version = "1.0.16" }
 serde = { workspace = true }
 serde_json = { workspace = true }
+serde_with = { version = "3.0.0" }
 similar = { workspace = true }
 smallvec = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
-thiserror = { workspace = true }
+thiserror = { version = "1.0.43" }
 toml = { workspace = true }
 typed-arena = { version = "2.0.2" }
 unicode-width = { workspace = true }
 unicode_names2 = { version = "0.6.0", git = "https://github.com/youknowone/unicode_names2.git", rev = "4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" }
+uuid = { workspace = true, features = ["v4", "fast-rng", "macro-diagnostics", "js"] }
 wsl = { version = "0.1.0" }
 
 [dev-dependencies]

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_1.py

@@ -1,5 +0,0 @@
-# Docstring followed by a newline
-
-def foobar(foor, bar={}):    
-    """
-    """

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_2.py

@@ -1,6 +0,0 @@
-# Docstring followed by whitespace with no newline
-# Regression test for https://github.com/astral-sh/ruff/issues/7155
-
-def foobar(foor, bar={}):    
-    """
-    """                    

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_3.py

@@ -1,6 +0,0 @@
-# Docstring with no newline
-
-
-def foobar(foor, bar={}):    
-    """
-    """

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_B008.py

@@ -308,7 +308,3 @@ def single_line_func_wrong(value: dict[str, str] = {
 def single_line_func_wrong(value: dict[str, str] = {}) \
     : \
     """Docstring"""
-
-
-def single_line_func_wrong(value: dict[str, str] = {}):
-    """Docstring without newline"""

crates/ruff/resources/test/fixtures/flake8_bugbear/B009_B010.py

@@ -1,7 +1,7 @@
 """
 Should emit:
-B009 - Lines 19-31
-B010 - Lines 40-45
+B009 - Line 19, 20, 21, 22, 23, 24
+B010 - Line 40, 41, 42, 43, 44, 45
 """
 
 # Valid getattr usage
@@ -24,16 +24,6 @@ getattr(foo, r"abc123")
 _ = lambda x: getattr(x, "bar")
 if getattr(x, "bar"):
     pass
-getattr(1, "real")
-getattr(1., "real")
-getattr(1.0, "real")
-getattr(1j, "real")
-getattr(True, "real")
-getattr(x := 1, "real")
-getattr(x + y, "real")
-getattr("foo"
-        "bar", "real")
-
 
 # Valid setattr usage
 setattr(foo, bar, None)

crates/ruff/resources/test/fixtures/flake8_bugbear/B013.py

@@ -1,5 +1,3 @@
-retriable_exceptions = (FileExistsError, FileNotFoundError)
-
 try:
     pass
 except (ValueError,):
@@ -8,7 +6,3 @@ except AttributeError:
     pass
 except (ImportError, TypeError):
     pass
-except (*retriable_exceptions,):
-    pass
-except(ValueError,):
-    pass

crates/ruff/resources/test/fixtures/flake8_comprehensions/C402.py

@@ -16,6 +16,3 @@ def f(x):
     return x
 
 print(f'Hello {dict((x,f(x)) for x in "abc")} World')
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7086
-dict((k,v)for k,v in d.iteritems() if k in only_args)

crates/ruff/resources/test/fixtures/flake8_comprehensions/C404.py

@@ -11,6 +11,3 @@ f"{dict([(s,f(s)) for s in 'ab'])}"
 
 f'{dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"])}'
 f'{ dict([(s,s) for s in "ab"]) | dict([(s,s) for s in "ab"]) }'
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7087
-saved.append(dict([(k, v)for k,v in list(unique_instance.__dict__.items()) if k in [f.name for f in unique_instance._meta.fields]]))

crates/ruff/resources/test/fixtures/flake8_comprehensions/C416.py

@@ -17,6 +17,3 @@ d = {"a": 1, "b": 2, "c": 3}
 {k.foo: k for k in y}
 {k["foo"]: k for k in y}
 {k: v if v else None for k, v in y}
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7196
-any(len(symbol_table.get_by_type(symbol_type)) > 0 for symbol_type in[t for t in SymbolType])

crates/ruff/resources/test/fixtures/flake8_comprehensions/C417.py

@@ -5,13 +5,11 @@ map(lambda x: str(x), nums)
 list(map(lambda x: x * 2, nums))
 set(map(lambda x: x % 2 == 0, nums))
 dict(map(lambda v: (v, v**2), nums))
-dict(map(lambda v: [v, v**2], nums))
 map(lambda: "const", nums)
 map(lambda _: 3.0, nums)
 _ = "".join(map(lambda x: x in nums and "1" or "0", range(123)))
 all(map(lambda v: isinstance(v, dict), nums))
 filter(func, map(lambda v: v, nums))
-list(map(lambda x, y: x * y, nums))
 
 # When inside f-string, then the fix should be surrounded by whitespace
 _ = f"{set(map(lambda x: x % 2 == 0, nums))}"
@@ -39,11 +37,3 @@ map(lambda x: lambda x: x, range(4))
 map(lambda x=1: x, nums)
 map(lambda *args: len(args), range(4))
 map(lambda **kwargs: len(kwargs), range(4))
-
-# Ok because multiple arguments are allowed.
-dict(map(lambda k, v: (k, v), keys, values))
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7121
-map(lambda x: x, y if y else z)
-map(lambda x: x, (y if y else z))
-map(lambda x: x, (x, y, z))

crates/ruff/resources/test/fixtures/flake8_pyi/PYI010.py

@@ -3,20 +3,16 @@ def bar():
 
 
 def foo():
-    """foo"""  # OK, docstrings are handled by another rule
+    """foo"""  # OK
 
 
 def buzz():
-    print("buzz")  # ERROR PYI010
+    print("buzz")  # OK, not in stub file
 
 
 def foo2():
-    123  # ERROR PYI010
+    123  # OK, not in a stub file
 
 
 def bizz():
-    x = 123  # ERROR PYI010
-
-
-def foo3():
-    pass  # OK, pass is handled by another rule
+    x = 123  # OK, not in a stub file

crates/ruff/resources/test/fixtures/flake8_pyi/PYI010.pyi

@@ -1,6 +1,6 @@
 def bar(): ...  # OK
 def foo():
-    """foo"""  # OK, docstrings are handled by another rule
+    """foo"""  # OK, strings are handled by another rule
 
 def buzz():
     print("buzz")  # ERROR PYI010
@@ -10,6 +10,3 @@ def foo2():
 
 def bizz():
     x = 123  # ERROR PYI010
-
-def foo3():
-    pass  # OK, pass is handled by another rule

crates/ruff/resources/test/fixtures/flake8_pyi/PYI048.py

@@ -1,27 +1,19 @@
-def bar():
-    ...  # OK
+def bar():    # OK
+    ...
 
 
-def bar():
-    pass  # OK
-
-
-def bar():
-    """oof"""  # OK
-
-
-def oof():  # ERROR PYI048
+def oof():    # OK, docstrings are handled by another rule
     """oof"""
     print("foo")
 
 
-def foo():  # ERROR PYI048
+def foo():    # Ok not in Stub file
     """foo"""
     print("foo")
     print("foo")
 
 
-def buzz():  # ERROR PYI048
+def buzz():    # Ok not in Stub file
     print("fizz")
     print("buzz")
     print("test")

crates/ruff/resources/test/fixtures/flake8_pyi/PYI048.pyi

@@ -1,20 +1,20 @@
-def bar(): ...  # OK
 def bar():
-    pass  # OK
+    ...  # OK
 
-def bar():
-    """oof"""  # OK
 
-def oof():  # ERROR PYI048
-    """oof"""
-    print("foo")
+def oof():   # OK, docstrings are handled by another rule
+  """oof"""
+  print("foo")
 
-def foo():  # ERROR PYI048
+
+
+def foo():   # ERROR PYI048
     """foo"""
     print("foo")
     print("foo")
 
-def buzz():  # ERROR PYI048
+
+def buzz():   # ERROR PYI048
     print("fizz")
     print("buzz")
     print("test")

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT018.py

@@ -52,21 +52,3 @@ def test_multiline():
 
     x = 1; \
         assert something and something_else
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7143
-def test_parenthesized_not():
-    assert not (
-        self.find_graph_output(node.output[0])
-        or self.find_graph_input(node.input[0])
-        or self.find_graph_output(node.input[0])
-    )
-
-    assert (not (
-        self.find_graph_output(node.output[0])
-        or self.find_graph_input(node.input[0])
-        or self.find_graph_output(node.input[0])
-    ))
-
-    assert (not self.find_graph_output(node.output[0]) or
-            self.find_graph_input(node.input[0]))

crates/ruff/resources/test/fixtures/flake8_return/RET504.py

@@ -357,9 +357,3 @@ def foo():
 def foo():
     a = 1  # Comment
     return a
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7098
-def mavko_debari(P_kbar):
-    D=0.4853881 + 3.6006116*P - 0.0117368*(P-1.3822)**2
-    return D

crates/ruff/resources/test/fixtures/flake8_self/SLF001_extended.py

@@ -1,10 +0,0 @@
-def foo(obj):
-    obj._meta  # OK
-
-
-def foo(obj):
-    obj._asdict  # SLF001
-
-
-def foo(obj):
-    obj._bar  # SLF001

crates/ruff/resources/test/fixtures/flake8_simplify/SIM105_0.py

@@ -8,7 +8,6 @@ try:
 except ValueError:
     pass
 
-
 # SIM105
 try:
     foo()
@@ -111,20 +110,3 @@ try:
     print()
 except "not an exception":
     pass
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7123
-def write_models(directory, Models):
-    try:
-        os.makedirs(model_dir);
-    except OSError:
-        pass;
-
-    try: os.makedirs(model_dir);
-    except OSError:
-        pass;
-
-    try: os.makedirs(model_dir);
-    except OSError:
-        pass; \
-            \
-            #

crates/ruff/resources/test/fixtures/flake8_simplify/SIM118.py

@@ -42,17 +42,3 @@ class Foo:
 
     def __contains__(self, key: object) -> bool:
         return key in self.keys()  # OK
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7124
-key in obj.keys()and foo
-(key in obj.keys())and foo
-key in (obj.keys())and foo
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7200
-for key in (
-    self.experiment.surveys[0]
-        .stations[0]
-        .keys()
-):
-    continue

crates/ruff/resources/test/fixtures/flake8_simplify/SIM210.py

@@ -13,8 +13,3 @@ def f():
         return False
 
     a = True if b else False
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7076
-samesld = True if (psl.privatesuffix(urlparse(response.url).netloc) ==
-                                   psl.privatesuffix(src.netloc)) else False

crates/ruff/resources/test/fixtures/flake8_simplify/SIM222.py

@@ -152,11 +152,3 @@ if (a or [1] or True or [2]) == (a or [1]):  # SIM222
 
 if f(a or [1] or True or [2]):  # SIM222
     pass
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7099
-def secondToTime(s0: int) -> (int, int, int) or str:
-    m, s = divmod(s0, 60)
-
-
-def secondToTime(s0: int) -> ((int, int, int) or str):
-    m, s = divmod(s0, 60)

crates/ruff/resources/test/fixtures/flake8_simplify/SIM300.py

@@ -14,8 +14,6 @@ YODA >= age  # SIM300
 JediOrder.YODA == age  # SIM300
 0 < (number - 100)  # SIM300
 SomeClass().settings.SOME_CONSTANT_VALUE > (60 * 60)  # SIM300
-B<A[0][0]or B
-B or(B)<A[0][0]
 
 # OK
 compare == "yoda"

crates/ruff/resources/test/fixtures/flynt/FLY002.py

@@ -16,8 +16,3 @@ nok4 = "a".join([a, a, *a])  # Not OK (not a static length)
 nok5 = "a".join([choice("flarp")])  # Not OK (not a simple call)
 nok6 = "a".join(x for x in "feefoofum")  # Not OK (generator)
 nok7 = "a".join([f"foo{8}", "bar"])  # Not OK (contains an f-string)
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7197
-def create_file_public_url(url, filename):
-    return''.join([url, filename])

crates/ruff/resources/test/fixtures/numpy/NPY001.py

@@ -18,8 +18,3 @@ pdf = pd.DataFrame(
 )
 
 _ = arr.astype(np.int)
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/6952
-from numpy import float
-
-float(1)

crates/ruff/resources/test/fixtures/numpy/NPY003.py

@@ -1,18 +1,15 @@
-def func():
-    import numpy as np
+import numpy as np
 
-    np.round_(np.random.rand(5, 5), 2)
-    np.product(np.random.rand(5, 5))
-    np.cumproduct(np.random.rand(5, 5))
-    np.sometrue(np.random.rand(5, 5))
-    np.alltrue(np.random.rand(5, 5))
+np.round_(np.random.rand(5, 5), 2)
+np.product(np.random.rand(5, 5))
+np.cumproduct(np.random.rand(5, 5))
+np.sometrue(np.random.rand(5, 5))
+np.alltrue(np.random.rand(5, 5))
 
+from numpy import round_, product, cumproduct, sometrue, alltrue
 
-def func():
-    from numpy import round_, product, cumproduct, sometrue, alltrue
-
-    round_(np.random.rand(5, 5), 2)
-    product(np.random.rand(5, 5))
-    cumproduct(np.random.rand(5, 5))
-    sometrue(np.random.rand(5, 5))
-    alltrue(np.random.rand(5, 5))
+round_(np.random.rand(5, 5), 2)
+product(np.random.rand(5, 5))
+cumproduct(np.random.rand(5, 5))
+sometrue(np.random.rand(5, 5))
+alltrue(np.random.rand(5, 5))

crates/ruff/resources/test/fixtures/pandas_vet/PD002.py

@@ -29,5 +29,3 @@ x.apply(lambda x: x.sort_values("a", inplace=True))
 import torch
 
 torch.m.ReLU(inplace=True)  # safe because this isn't a pandas call
-
-(x.drop(["a"], axis=1, inplace=True))

crates/ruff/resources/test/fixtures/pep8_naming/N806.py

@@ -1,6 +1,8 @@
 import collections
 from collections import namedtuple
-from typing import TypeAlias, TypeVar, NewType, NamedTuple, TypedDict
+from typing import TypeVar
+from typing import NewType
+from typing import NamedTuple, TypedDict
 
 GLOBAL: str = "foo"
 
@@ -19,11 +21,9 @@ def assign():
     T = TypeVar("T")
     UserId = NewType("UserId", int)
 
-    Employee = NamedTuple("Employee", [("name", str), ("id", int)])
+    Employee = NamedTuple('Employee', [('name', str), ('id', int)])
 
-    Point2D = TypedDict("Point2D", {"in": int, "x-y": int})
-
-    IntOrStr: TypeAlias = int | str
+    Point2D = TypedDict('Point2D', {'in': int, 'x-y': int})
 
 
 def aug_assign(rank, world_size):

crates/ruff/resources/test/fixtures/perflint/PERF401.py

@@ -18,11 +18,11 @@ def f():
     result = []
     for i in items:
         if i % 2:
-            result.append(i)  # Ok
+            result.append(i)  # PERF401
         elif i % 2:
-            result.append(i)
+            result.append(i)  # PERF401
         else:
-            result.append(i)
+            result.append(i)  # PERF401
 
 
 def f():
@@ -60,15 +60,3 @@ def f():
     for i in range(20):
         foo.fibonacci.append(sum(foo.fibonacci[-2:]))  # OK
     print(foo.fibonacci)
-
-
-class Foo:
-    def append(self, x):
-        pass
-
-
-def f():
-    items = [1, 2, 3, 4]
-    result = Foo()
-    for i in items:
-        result.append(i)  # Ok

crates/ruff/resources/test/fixtures/perflint/PERF402.py

@@ -24,22 +24,3 @@ def f():
     result = {}
     for i in items:
         result[i].append(i * i)  # OK
-
-
-class Foo:
-    def append(self, x):
-        pass
-
-
-def f():
-    items = [1, 2, 3, 4]
-    result = Foo()
-    for i in items:
-        result.append(i)  # OK
-
-
-def f():
-    import sys
-
-    for path in ("foo", "bar"):
-        sys.path.append(path)  # OK

crates/ruff/resources/test/fixtures/pycodestyle/E731.py

@@ -138,12 +138,3 @@ def scope():
 class TemperatureScales(Enum):
     CELSIUS = (lambda deg_c: deg_c)
     FAHRENHEIT = (lambda deg_c: deg_c * 9 / 5 + 32)
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7141
-def scope():
-    # E731
-
-    f = lambda: (
-        i := 1,
-    )

crates/ruff/resources/test/fixtures/pydocstyle/D.py

@@ -639,22 +639,3 @@ def starts_with_space_then_this():
 class SameLine: """This is a docstring on the same line"""
 
 def same_line(): """This is a docstring on the same line"""
-
-
-def single_line_docstring_with_an_escaped_backslash():
-    "\
-    "
-
-class StatementOnSameLineAsDocstring:
-    "After this docstring there's another statement on the same line separated by a semicolon." ; priorities=1
-    def sort_services(self):
-        pass
-
-class StatementOnSameLineAsDocstring:
-    "After this docstring there's another statement on the same line separated by a semicolon."; priorities=1
-
-
-class CommentAfterDocstring:
-    "After this docstring there's a comment."  # priorities=1
-    def sort_services(self):
-        pass

crates/ruff/resources/test/fixtures/pydocstyle/D417.py

@@ -128,19 +128,6 @@ def f(x, *, y, z):
     """
     return x, y, z
 
-def f(x):
-    """Do something with valid description.
-
-    Args:
-    ----
-        x: the value
-
-    Returns:
-    -------
-        the value
-    """
-    return x
-
 
 class Test:
     def f(self, /, arg1: int) -> None:

crates/ruff/resources/test/fixtures/pyflakes/F401_0.py

@@ -112,11 +112,3 @@ match *0, 1, *2:
         import b1
 
         import b2
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7244
-from datameta_client_lib.model_utils import (  # noqa: F401
-noqa )
-
-from datameta_client_lib.model_helpers import (
-noqa )

crates/ruff/resources/test/fixtures/pyflakes/F504.py

@@ -9,8 +9,3 @@ hidden = {"a": "!"}
 "%(a)s" % {'a': 1, u"b": "!"}  # F504 ("b" not used)
 
 '' % {'a''b' : ''}  # F504 ("ab" not used)
-
-# https://github.com/astral-sh/ruff/issues/4899
-"" % {
-  'test1': '',
-  'test2': '',

crates/ruff/resources/test/fixtures/pyflakes/F841_3.py

@@ -165,9 +165,3 @@ def f():
     x = 1
 
     y = 2
-
-
-def f():
-    (x) = foo()
-    ((x)) = foo()
-    (x) = (y.z) = foo()

crates/ruff/resources/test/fixtures/pylint/nested_min_max.py

@@ -36,6 +36,3 @@ tuples_list = [
 
 min(min(tuples_list))
 max(max(tuples_list))
-
-# Starred argument should be copied as it is.
-max(1, max(*a))

crates/ruff/resources/test/fixtures/pyupgrade/UP007.py

@@ -91,20 +91,3 @@ def f(x: Optional[int : float]) -> None:
 
 def f(x: Optional[str, int : float]) -> None:
     ...
-
-
-def f(x: Optional[int, float]) -> None:
-    ...
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7131
-class ServiceRefOrValue:
-    service_specification: Optional[
-        list[ServiceSpecificationRef]
-        | list[ServiceSpecification]
-    ] = None
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7201
-class ServiceRefOrValue:
-    service_specification: Optional[str]is not True = None

crates/ruff/resources/test/fixtures/pyupgrade/UP014.py

@@ -22,4 +22,3 @@ MyType = typing.NamedTuple("MyType", a=int, b=tuple[str, ...])
 # unfixable
 MyType = typing.NamedTuple("MyType", [("a", int)], [("b", str)])
 MyType = typing.NamedTuple("MyType", [("a", int)], b=str)
-MyType = typing.NamedTuple(typename="MyType", a=int, b=str)

crates/ruff/resources/test/fixtures/pyupgrade/UP021.py

@@ -1,10 +1,12 @@
 import subprocess
+import subprocess as somename
 from subprocess import run
+from subprocess import run as anothername
 
-# Errors
 subprocess.run(["foo"], universal_newlines=True, check=True)
-subprocess.run(["foo"], universal_newlines=True, text=True)
-run(["foo"], universal_newlines=True, check=False)
+somename.run(["foo"], universal_newlines=True)
+
+run(["foo"], universal_newlines=True, check=False)
+anothername(["foo"], universal_newlines=True)
 
-# OK
 subprocess.run(["foo"], check=True)

crates/ruff/resources/test/fixtures/pyupgrade/UP022.py

@@ -35,19 +35,8 @@ if output:
         encoding="utf-8",
     )
 
-output = subprocess.run(
-    ["foo"], stdout=subprocess.PIPE, capture_output=True, stderr=subprocess.PIPE
-)
 
-output = subprocess.run(
-    ["foo"], stdout=subprocess.PIPE, capture_output=False, stderr=subprocess.PIPE
-)
-
-output = subprocess.run(
-    ["foo"], capture_output=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-)
-
-# OK
+# Examples that should NOT trigger the rule
 from foo import PIPE
 subprocess.run(["foo"], stdout=PIPE, stderr=PIPE)
 run(["foo"], stdout=None, stderr=PIPE)

crates/ruff/resources/test/fixtures/pyupgrade/UP024_0.py

@@ -96,11 +96,3 @@ try:
     pass
 except (OSError, KeyError):
     pass
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7101
-def get_owner_id_from_mac_address():
-    try:
-        mac_address = get_primary_mac_address()
-    except(IOError, OSError) as ex:
-        msg = 'Unable to query URL to get Owner ID: {u}\n{e}'.format(u=owner_id_url, e=ex)

crates/ruff/resources/test/fixtures/pyupgrade/UP028_0.py

@@ -72,12 +72,3 @@ def f():
     for x, y in z():
         yield x, y
     x = 1
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7103
-def _serve_method(fn):
-    for h in (
-        TaggedText.from_file(args.input)
-            .markup(highlight=args.region)
-    ):
-        yield h

crates/ruff/resources/test/fixtures/pyupgrade/UP028_1.py

@@ -1,4 +1,4 @@
-# OK
+# These should NOT change
 def f():
     for x in z:
         yield

crates/ruff/resources/test/fixtures/refurb/FURB113.py

@@ -1,169 +0,0 @@
-from typing import List
-
-
-def func():
-    pass
-
-
-nums = []
-nums2 = []
-nums3: list[int] = func()
-nums4: List[int]
-
-
-class C:
-    def append(self, x):
-        pass
-
-
-# Errors.
-
-
-# FURB113
-nums.append(1)
-nums.append(2)
-pass
-
-
-# FURB113
-nums3.append(1)
-nums3.append(2)
-pass
-
-
-# FURB113
-nums4.append(1)
-nums4.append(2)
-pass
-
-
-# FURB113
-nums.append(1)
-nums2.append(1)
-nums.append(2)
-nums.append(3)
-pass
-
-
-# FURB113
-nums.append(1)
-nums2.append(1)
-nums.append(2)
-# FURB113
-nums3.append(1)
-nums.append(3)
-# FURB113
-nums4.append(1)
-nums4.append(2)
-nums3.append(2)
-pass
-
-# FURB113
-nums.append(1)
-nums.append(2)
-nums.append(3)
-
-
-if True:
-    # FURB113
-    nums.append(1)
-    nums.append(2)
-
-
-if True:
-    # FURB113
-    nums.append(1)
-    nums.append(2)
-    pass
-
-
-if True:
-    # FURB113
-    nums.append(1)
-    nums2.append(1)
-    nums.append(2)
-    nums.append(3)
-
-
-def yes_one(x: list[int]):
-    # FURB113
-    x.append(1)
-    x.append(2)
-
-
-def yes_two(x: List[int]):
-    # FURB113
-    x.append(1)
-    x.append(2)
-
-
-def yes_three(*, x: list[int]):
-    # FURB113
-    x.append(1)
-    x.append(2)
-
-
-def yes_four(x: list[int], /):
-    # FURB113
-    x.append(1)
-    x.append(2)
-
-
-def yes_five(x: list[int], y: list[int]):
-    # FURB113
-    x.append(1)
-    x.append(2)
-    y.append(1)
-    x.append(3)
-
-
-def yes_six(x: list):
-    # FURB113
-    x.append(1)
-    x.append(2)
-
-
-# Non-errors.
-
-nums.append(1)
-pass
-nums.append(2)
-
-
-if True:
-    nums.append(1)
-    pass
-    nums.append(2)
-
-
-nums.append(1)
-pass
-
-
-nums.append(1)
-nums2.append(2)
-
-
-nums.copy()
-nums.copy()
-
-
-c = C()
-c.append(1)
-c.append(2)
-
-
-def not_one(x):
-    x.append(1)
-    x.append(2)
-
-
-def not_two(x: C):
-    x.append(1)
-    x.append(2)
-
-
-# redefining a list variable with a new type shouldn't confuse ruff.
-nums2 = C()
-nums2.append(1)
-nums2.append(2)

crates/ruff/resources/test/fixtures/refurb/FURB131.py

@@ -1,64 +0,0 @@
-from typing import Dict, List
-
-names = {"key": "value"}
-nums = [1, 2, 3]
-x = 42
-y = "hello"
-
-# these should match
-
-# FURB131
-del nums[:]
-
-
-# FURB131
-del names[:]
-
-
-# FURB131
-del x, nums[:]
-
-
-# FURB131
-del y, names[:], x
-
-
-def yes_one(x: list[int]):
-    # FURB131
-    del x[:]
-
-
-def yes_two(x: dict[int, str]):
-    # FURB131
-    del x[:]
-
-
-def yes_three(x: List[int]):
-    # FURB131
-    del x[:]
-
-
-def yes_four(x: Dict[int, str]):
-    # FURB131
-    del x[:]
-
-
-# these should not
-
-del names["key"]
-del nums[0]
-
-x = 1
-del x
-
-
-del nums[1:2]
-
-
-del nums[:2]
-del nums[1:]
-del nums[::2]
-
-
-def no_one(param):
-    del param[:]

crates/ruff/resources/test/fixtures/refurb/FURB132.py

@@ -1,80 +0,0 @@
-from typing import Set
-from some.package.name import foo, bar
-
-
-s = set()
-s2 = {}
-s3: set[int] = foo()
-
-# these should match
-
-# FURB132
-if "x" in s:
-    s.remove("x")
-
-
-# FURB132
-if "x" in s2:
-    s2.remove("x")
-
-
-# FURB132
-if "x" in s3:
-    s3.remove("x")
-
-
-var = "y"
-# FURB132
-if var in s:
-    s.remove(var)
-
-
-if f"{var}:{var}" in s:
-    s.remove(f"{var}:{var}")
-
-
-def identity(x):
-    return x
-
-
-# TODO: FURB132
-if identity("x") in s2:
-    s2.remove(identity("x"))
-
-
-# these should not
-
-if "x" in s:
-    s.remove("y")
-
-s.discard("x")
-
-s2 = set()
-
-if "x" in s:
-    s2.remove("x")
-
-if "x" in s:
-    s.remove("x")
-    print("removed item")
-
-if bar() in s:
-    # bar() might have a side effect
-    s.remove(bar())
-
-if "x" in s:
-    s.remove("x")
-else:
-    print("not found")
-
-class Container:
-    def remove(self, item) -> None:
-        return
-
-    def __contains__(self, other) -> bool:
-        return True
-
-c = Container()
-
-if "x" in c:
-    c.remove("x")

crates/ruff/resources/test/fixtures/ruff/RUF017.py

@@ -12,10 +12,3 @@ sum([[1, 2, 3], [4, 5, 6]],
 # OK
 sum([x, y])
 sum([[1, 2, 3], [4, 5, 6]])
-
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/7059
-def func():
-    import functools, operator
-
-    sum([x, y], [])

crates/ruff/src/autofix/codemods.rs

@@ -8,6 +8,7 @@ use libcst_native::{
 use ruff_python_ast::Stmt;
 use ruff_python_codegen::Stylist;
 use ruff_source_file::Locator;
+use ruff_text_size::Ranged;
 
 use crate::cst::helpers::compose_module_path;
 use crate::cst::matchers::match_statement;
@@ -38,7 +39,7 @@ pub(crate) fn remove_imports<'a>(
     locator: &Locator,
     stylist: &Stylist,
 ) -> Result<Option<String>> {
-    let module_text = locator.slice(stmt);
+    let module_text = locator.slice(stmt.range());
     let mut tree = match_statement(module_text)?;
 
     let Statement::Simple(body) = &mut tree else {
@@ -117,7 +118,7 @@ pub(crate) fn retain_imports(
     locator: &Locator,
     stylist: &Stylist,
 ) -> Result<String> {
-    let module_text = locator.slice(stmt);
+    let module_text = locator.slice(stmt.range());
     let mut tree = match_statement(module_text)?;
 
     let Statement::Simple(body) = &mut tree else {

crates/ruff/src/autofix/edits.rs

@@ -10,7 +10,7 @@ use ruff_python_trivia::{
     has_leading_content, is_python_whitespace, PythonWhitespace, SimpleTokenKind, SimpleTokenizer,
 };
 use ruff_source_file::{Locator, NewlineWithTrailingNewline};
-use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
+use ruff_text_size::{Ranged, TextLen, TextSize};
 
 use crate::autofix::codemods;
 
@@ -249,44 +249,6 @@ fn next_stmt_break(semicolon: TextSize, locator: &Locator) -> TextSize {
     locator.line_end(start_location)
 }
 
-/// Add leading whitespace to a snippet, if it's immediately preceded an identifier or keyword.
-pub(crate) fn pad_start(mut content: String, start: TextSize, locator: &Locator) -> String {
-    // Ex) When converting `except(ValueError,)` from a tuple to a single argument, we need to
-    // insert a space before the fix, to achieve `except ValueError`.
-    if locator
-        .up_to(start)
-        .chars()
-        .last()
-        .is_some_and(|char| char.is_ascii_alphabetic())
-    {
-        content.insert(0, ' ');
-    }
-    content
-}
-
-/// Add trailing whitespace to a snippet, if it's immediately followed by an identifier or keyword.
-pub(crate) fn pad_end(mut content: String, end: TextSize, locator: &Locator) -> String {
-    if locator
-        .after(end)
-        .chars()
-        .next()
-        .is_some_and(|char| char.is_ascii_alphabetic())
-    {
-        content.push(' ');
-    }
-    content
-}
-
-/// Add leading or trailing whitespace to a snippet, if it's immediately preceded or followed by
-/// an identifier or keyword.
-pub(crate) fn pad(content: String, range: TextRange, locator: &Locator) -> String {
-    pad_start(
-        pad_end(content, range.end(), locator),
-        range.start(),
-        locator,
-    )
-}
-
 #[cfg(test)]
 mod tests {
     use anyhow::Result;

crates/ruff/src/autofix/mod.rs

@@ -4,15 +4,17 @@ use std::collections::BTreeSet;
 use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
 use rustc_hash::{FxHashMap, FxHashSet};
 
-use ruff_diagnostics::{Diagnostic, Edit, Fix, IsolationLevel, SourceMap};
+use ruff_diagnostics::{Diagnostic, Edit, Fix, IsolationLevel};
 use ruff_source_file::Locator;
 
+use crate::autofix::source_map::SourceMap;
 use crate::linter::FixTable;
 use crate::registry::{AsRule, Rule};
 
 pub(crate) mod codemods;
 pub(crate) mod edits;
 pub(crate) mod snippet;
+pub(crate) mod source_map;
 
 pub(crate) struct FixResult {
     /// The resulting source code, after applying all fixes.
@@ -138,9 +140,10 @@ fn cmp_fix(rule1: Rule, rule2: Rule, fix1: &Fix, fix2: &Fix) -> std::cmp::Orderi
 mod tests {
     use ruff_text_size::{Ranged, TextSize};
 
-    use ruff_diagnostics::{Diagnostic, Edit, Fix, SourceMarker};
+    use ruff_diagnostics::{Diagnostic, Edit, Fix};
     use ruff_source_file::Locator;
 
+    use crate::autofix::source_map::SourceMarker;
     use crate::autofix::{apply_fixes, FixResult};
     use crate::rules::pycodestyle::rules::MissingNewlineAtEndOfFile;
 
@@ -204,8 +207,14 @@ print("hello world")
         assert_eq!(
             source_map.markers(),
             &[
-                SourceMarker::new(10.into(), 10.into(),),
-                SourceMarker::new(10.into(), 21.into(),),
+                SourceMarker {
+                    source: 10.into(),
+                    dest: 10.into(),
+                },
+                SourceMarker {
+                    source: 10.into(),
+                    dest: 21.into(),
+                },
             ]
         );
     }
@@ -241,8 +250,14 @@ class A(Bar):
         assert_eq!(
             source_map.markers(),
             &[
-                SourceMarker::new(8.into(), 8.into(),),
-                SourceMarker::new(14.into(), 11.into(),),
+                SourceMarker {
+                    source: 8.into(),
+                    dest: 8.into(),
+                },
+                SourceMarker {
+                    source: 14.into(),
+                    dest: 11.into(),
+                },
             ]
         );
     }
@@ -274,8 +289,14 @@ class A:
         assert_eq!(
             source_map.markers(),
             &[
-                SourceMarker::new(7.into(), 7.into()),
-                SourceMarker::new(15.into(), 7.into()),
+                SourceMarker {
+                    source: 7.into(),
+                    dest: 7.into()
+                },
+                SourceMarker {
+                    source: 15.into(),
+                    dest: 7.into()
+                }
             ]
         );
     }
@@ -311,10 +332,22 @@ class A(object):
         assert_eq!(
             source_map.markers(),
             &[
-                SourceMarker::new(8.into(), 8.into()),
-                SourceMarker::new(16.into(), 8.into()),
-                SourceMarker::new(22.into(), 14.into(),),
-                SourceMarker::new(30.into(), 14.into(),),
+                SourceMarker {
+                    source: 8.into(),
+                    dest: 8.into()
+                },
+                SourceMarker {
+                    source: 16.into(),
+                    dest: 8.into()
+                },
+                SourceMarker {
+                    source: 22.into(),
+                    dest: 14.into(),
+                },
+                SourceMarker {
+                    source: 30.into(),
+                    dest: 14.into(),
+                }
             ]
         );
     }
@@ -349,8 +382,14 @@ class A:
         assert_eq!(
             source_map.markers(),
             &[
-                SourceMarker::new(7.into(), 7.into(),),
-                SourceMarker::new(15.into(), 7.into(),),
+                SourceMarker {
+                    source: 7.into(),
+                    dest: 7.into(),
+                },
+                SourceMarker {
+                    source: 15.into(),
+                    dest: 7.into(),
+                }
             ]
         );
     }

crates/ruff/src/autofix/snippet.rs

@@ -9,10 +9,6 @@ impl SourceCodeSnippet {
         Self(source_code)
     }
 
-    pub(crate) fn from_str(source_code: &str) -> Self {
-        Self(source_code.to_string())
-    }
-
     /// Return the full snippet for user-facing display, or `None` if the snippet should be
     /// truncated.
     pub(crate) fn full_display(&self) -> Option<&str> {

crates/ruff/src/autofix/source_map.rs

@@ -1,29 +1,15 @@
 use ruff_text_size::{Ranged, TextSize};
 
-use crate::Edit;
+use ruff_diagnostics::Edit;
 
 /// Lightweight sourcemap marker representing the source and destination
 /// position for an [`Edit`].
 #[derive(Debug, PartialEq, Eq)]
-pub struct SourceMarker {
+pub(crate) struct SourceMarker {
     /// Position of the marker in the original source.
-    source: TextSize,
+    pub(crate) source: TextSize,
     /// Position of the marker in the transformed code.
-    dest: TextSize,
-}
-
-impl SourceMarker {
-    pub fn new(source: TextSize, dest: TextSize) -> Self {
-        Self { source, dest }
-    }
-
-    pub const fn source(&self) -> TextSize {
-        self.source
-    }
-
-    pub const fn dest(&self) -> TextSize {
-        self.dest
-    }
+    pub(crate) dest: TextSize,
 }
 
 /// A collection of [`SourceMarker`].
@@ -32,12 +18,12 @@ impl SourceMarker {
 /// the transformed code. Here, only the boundaries of edits are tracked instead
 /// of every single character.
 #[derive(Default, PartialEq, Eq)]
-pub struct SourceMap(Vec<SourceMarker>);
+pub(crate) struct SourceMap(Vec<SourceMarker>);
 
 impl SourceMap {
     /// Returns a slice of all the markers in the sourcemap in the order they
     /// were added.
-    pub fn markers(&self) -> &[SourceMarker] {
+    pub(crate) fn markers(&self) -> &[SourceMarker] {
         &self.0
     }
 
@@ -45,7 +31,7 @@ impl SourceMap {
     ///
     /// The `output_length` is the length of the transformed string before the
     /// edit is applied.
-    pub fn push_start_marker(&mut self, edit: &Edit, output_length: TextSize) {
+    pub(crate) fn push_start_marker(&mut self, edit: &Edit, output_length: TextSize) {
         self.0.push(SourceMarker {
             source: edit.start(),
             dest: output_length,
@@ -56,7 +42,7 @@ impl SourceMap {
     ///
     /// The `output_length` is the length of the transformed string after the
     /// edit has been applied.
-    pub fn push_end_marker(&mut self, edit: &Edit, output_length: TextSize) {
+    pub(crate) fn push_end_marker(&mut self, edit: &Edit, output_length: TextSize) {
         if edit.is_insertion() {
             self.0.push(SourceMarker {
                 source: edit.start(),

crates/ruff/src/checkers/ast/analyze/definitions.rs

@@ -163,9 +163,9 @@ pub(crate) fn definitions(checker: &mut Checker) {
                 continue;
             };
 
-            let contents = checker.locator().slice(expr);
+            let contents = checker.locator.slice(expr.range());
 
-            let indentation = checker.locator().slice(TextRange::new(
+            let indentation = checker.locator.slice(TextRange::new(
                 checker.locator.line_start(expr.start()),
                 expr.start(),
             ));

crates/ruff/src/checkers/ast/analyze/expression.rs

@@ -1039,7 +1039,12 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                     }
                 }
                 if checker.enabled(Rule::PrintfStringFormatting) {
-                    pyupgrade::rules::printf_string_formatting(checker, expr, right);
+                    pyupgrade::rules::printf_string_formatting(
+                        checker,
+                        expr,
+                        right,
+                        checker.locator,
+                    );
                 }
                 if checker.enabled(Rule::BadStringFormatCharacter) {
                     pylint::rules::bad_string_format_character::percent(checker, expr);
@@ -1195,6 +1200,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
         }
         Expr::Constant(ast::ExprConstant {
             value: Constant::Int(_) | Constant::Float(_) | Constant::Complex { .. },
+            kind: _,
             range: _,
         }) => {
             if checker.source_type.is_stub() && checker.enabled(Rule::NumericLiteralTooLong) {
@@ -1203,6 +1209,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
         }
         Expr::Constant(ast::ExprConstant {
             value: Constant::Bytes(_),
+            kind: _,
             range: _,
         }) => {
             if checker.source_type.is_stub() && checker.enabled(Rule::StringOrBytesTooLong) {
@@ -1211,6 +1218,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
         }
         Expr::Constant(ast::ExprConstant {
             value: Constant::Str(value),
+            kind,
             range: _,
         }) => {
             if checker.enabled(Rule::HardcodedBindAllInterfaces) {
@@ -1224,7 +1232,7 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
                 flake8_bandit::rules::hardcoded_tmp_directory(checker, expr, value);
             }
             if checker.enabled(Rule::UnicodeKindPrefix) {
-                pyupgrade::rules::unicode_kind_prefix(checker, expr, value.unicode);
+                pyupgrade::rules::unicode_kind_prefix(checker, expr, kind.as_deref());
             }
             if checker.source_type.is_stub() {
                 if checker.enabled(Rule::StringOrBytesTooLong) {
@@ -1250,10 +1258,14 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             range: _,
         }) => {
             if checker.enabled(Rule::IfExprWithTrueFalse) {
-                flake8_simplify::rules::if_expr_with_true_false(checker, expr, test, body, orelse);
+                flake8_simplify::rules::explicit_true_false_in_ifexpr(
+                    checker, expr, test, body, orelse,
+                );
             }
             if checker.enabled(Rule::IfExprWithFalseTrue) {
-                flake8_simplify::rules::if_expr_with_false_true(checker, expr, test, body, orelse);
+                flake8_simplify::rules::explicit_false_true_in_ifexpr(
+                    checker, expr, test, body, orelse,
+                );
             }
             if checker.enabled(Rule::IfExprWithTwistedArms) {
                 flake8_simplify::rules::twisted_arms_in_ifexpr(checker, expr, test, body, orelse);
@@ -1351,8 +1363,8 @@ pub(crate) fn expression(expr: &Expr, checker: &mut Checker) {
             if checker.enabled(Rule::ExprAndFalse) {
                 flake8_simplify::rules::expr_and_false(checker, expr);
             }
-            if checker.enabled(Rule::RepeatedEqualityComparison) {
-                pylint::rules::repeated_equality_comparison(checker, bool_op);
+            if checker.enabled(Rule::RepeatedEqualityComparisonTarget) {
+                pylint::rules::repeated_equality_comparison_target(checker, bool_op);
             }
         }
         _ => {}

crates/ruff/src/checkers/ast/analyze/statement.rs

@@ -13,7 +13,7 @@ use crate::rules::{
     flake8_django, flake8_errmsg, flake8_import_conventions, flake8_pie, flake8_pyi,
     flake8_pytest_style, flake8_raise, flake8_return, flake8_simplify, flake8_slots,
     flake8_tidy_imports, flake8_type_checking, mccabe, pandas_vet, pep8_naming, perflint,
-    pycodestyle, pyflakes, pygrep_hooks, pylint, pyupgrade, refurb, ruff, tryceratops,
+    pycodestyle, pyflakes, pygrep_hooks, pylint, pyupgrade, ruff, tryceratops,
 };
 use crate::settings::types::PythonVersion;
 
@@ -1056,9 +1056,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     checker.diagnostics.push(diagnostic);
                 }
             }
-            if checker.enabled(Rule::CheckAndRemoveFromSet) {
-                refurb::rules::check_and_remove_from_set(checker, if_);
-            }
             if checker.source_type.is_stub() {
                 if checker.any_enabled(&[
                     Rule::UnrecognizedVersionInfoCheck,
@@ -1462,7 +1459,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 }
             }
         }
-        Stmt::Delete(delete @ ast::StmtDelete { targets, range: _ }) => {
+        Stmt::Delete(ast::StmtDelete { targets, range: _ }) => {
             if checker.enabled(Rule::GlobalStatement) {
                 for target in targets {
                     if let Expr::Name(ast::ExprName { id, .. }) = target {
@@ -1470,9 +1467,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     }
                 }
             }
-            if checker.enabled(Rule::DeleteFullSlice) {
-                refurb::rules::delete_full_slice(checker, delete);
-            }
         }
         Stmt::Expr(ast::StmtExpr { value, range: _ }) => {
             if checker.enabled(Rule::UselessComparison) {
@@ -1490,9 +1484,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             if checker.enabled(Rule::AsyncioDanglingTask) {
                 ruff::rules::asyncio_dangling_task(checker, value);
             }
-            if checker.enabled(Rule::RepeatedAppend) {
-                refurb::rules::repeated_append(checker, stmt);
-            }
         }
         _ => {}
     }

crates/ruff/src/checkers/ast/mod.rs

@@ -528,7 +528,11 @@ where
                     &self.semantic.definitions,
                 );
                 self.semantic.push_definition(definition);
-                self.semantic.push_scope(ScopeKind::Function(function_def));
+
+                self.semantic.push_scope(match &stmt {
+                    Stmt::FunctionDef(stmt) => ScopeKind::Function(stmt),
+                    _ => unreachable!("Expected Stmt::FunctionDef"),
+                });
 
                 self.deferred.functions.push(self.semantic.snapshot());
 
@@ -1188,6 +1192,7 @@ where
             }
             Expr::Constant(ast::ExprConstant {
                 value: Constant::Str(value),
+                kind: _,
                 range: _,
             }) => {
                 if self.semantic.in_type_definition()

crates/ruff/src/checkers/imports.rs

@@ -85,7 +85,7 @@ pub(crate) fn check_imports(
     stylist: &Stylist,
     path: &Path,
     package: Option<&Path>,
-    source_kind: &SourceKind,
+    source_kind: Option<&SourceKind>,
     source_type: PySourceType,
 ) -> (Vec<Diagnostic>, Option<ImportMap>) {
     // Extract all import blocks from the AST.

crates/ruff/src/checkers/noqa.rs

@@ -110,7 +110,7 @@ pub(crate) fn check_noqa(
                             Diagnostic::new(UnusedNOQA { codes: None }, directive.range());
                         if settings.rules.should_fix(diagnostic.kind.rule()) {
                             diagnostic
-                                .set_fix(Fix::suggested(delete_noqa(directive.range(), locator)));
+                                .set_fix(Fix::automatic(delete_noqa(directive.range(), locator)));
                         }
                         diagnostics.push(diagnostic);
                     }
@@ -174,12 +174,12 @@ pub(crate) fn check_noqa(
                         );
                         if settings.rules.should_fix(diagnostic.kind.rule()) {
                             if valid_codes.is_empty() {
-                                diagnostic.set_fix(Fix::suggested(delete_noqa(
+                                diagnostic.set_fix(Fix::automatic(delete_noqa(
                                     directive.range(),
                                     locator,
                                 )));
                             } else {
-                                diagnostic.set_fix(Fix::suggested(Edit::range_replacement(
+                                diagnostic.set_fix(Fix::automatic(Edit::range_replacement(
                                     format!("# noqa: {}", valid_codes.join(", ")),
                                     directive.range(),
                                 )));

crates/ruff/src/codes.rs

@@ -212,7 +212,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pylint, "R0915") => (RuleGroup::Unspecified, rules::pylint::rules::TooManyStatements),
         (Pylint, "R1701") => (RuleGroup::Unspecified, rules::pylint::rules::RepeatedIsinstanceCalls),
         (Pylint, "R1711") => (RuleGroup::Unspecified, rules::pylint::rules::UselessReturn),
-        (Pylint, "R1714") => (RuleGroup::Unspecified, rules::pylint::rules::RepeatedEqualityComparison),
+        (Pylint, "R1714") => (RuleGroup::Unspecified, rules::pylint::rules::RepeatedEqualityComparisonTarget),
         (Pylint, "R1722") => (RuleGroup::Unspecified, rules::pylint::rules::SysExitAlias),
         (Pylint, "R2004") => (RuleGroup::Unspecified, rules::pylint::rules::MagicValueComparison),
         (Pylint, "R5501") => (RuleGroup::Unspecified, rules::pylint::rules::CollapsibleElseIf),
@@ -865,11 +865,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Slots, "001") => (RuleGroup::Unspecified, rules::flake8_slots::rules::NoSlotsInTupleSubclass),
         (Flake8Slots, "002") => (RuleGroup::Unspecified, rules::flake8_slots::rules::NoSlotsInNamedtupleSubclass),
 
-        // refurb
-        (Refurb, "113") => (RuleGroup::Nursery, rules::refurb::rules::RepeatedAppend),
-        (Refurb, "131") => (RuleGroup::Nursery, rules::refurb::rules::DeleteFullSlice),
-        (Refurb, "132") => (RuleGroup::Nursery, rules::refurb::rules::CheckAndRemoveFromSet),
-
         _ => return None,
     })
 }

crates/ruff/src/cst/helpers.rs

@@ -1,4 +1,4 @@
-use libcst_native::{Expression, NameOrAttribute, ParenthesizableWhitespace, SimpleWhitespace};
+use libcst_native::{Expression, NameOrAttribute};
 
 fn compose_call_path_inner<'a>(expr: &'a Expression, parts: &mut Vec<&'a str>) {
     match expr {
@@ -36,17 +36,3 @@ pub(crate) fn compose_module_path(module: &NameOrAttribute) -> String {
         }
     }
 }
-
-/// Return a [`ParenthesizableWhitespace`] containing a single space.
-pub(crate) fn space() -> ParenthesizableWhitespace<'static> {
-    ParenthesizableWhitespace::SimpleWhitespace(SimpleWhitespace(" "))
-}
-
-/// Ensure that a [`ParenthesizableWhitespace`] contains at least one space.
-pub(crate) fn or_space(whitespace: ParenthesizableWhitespace) -> ParenthesizableWhitespace {
-    if whitespace == ParenthesizableWhitespace::default() {
-        space()
-    } else {
-        whitespace
-    }
-}

crates/ruff/src/doc_lines.rs

@@ -76,7 +76,7 @@ impl StatementVisitor<'_> for StringLinesVisitor<'_> {
             }) = value.as_ref()
             {
                 for line in UniversalNewlineIterator::with_offset(
-                    self.locator.slice(value.as_ref()),
+                    self.locator.slice(value.range()),
                     value.start(),
                 ) {
                     self.string_lines.push(line.start());

crates/ruff/src/importer/mod.rs

@@ -171,8 +171,10 @@ impl<'a> Importer<'a> {
         at: TextSize,
         semantic: &SemanticModel,
     ) -> Result<(Edit, String), ResolutionError> {
-        self.get_symbol(symbol, at, semantic)?
-            .map_or_else(|| self.import_symbol(symbol, at, semantic), Ok)
+        match self.get_symbol(symbol, at, semantic) {
+            Some(result) => result,
+            None => self.import_symbol(symbol, at, semantic),
+        }
     }
 
     /// Return an [`Edit`] to reference an existing symbol, if it's present in the given [`SemanticModel`].
@@ -181,13 +183,9 @@ impl<'a> Importer<'a> {
         symbol: &ImportRequest,
         at: TextSize,
         semantic: &SemanticModel,
-    ) -> Result<Option<(Edit, String)>, ResolutionError> {
+    ) -> Option<Result<(Edit, String), ResolutionError>> {
         // If the symbol is already available in the current scope, use it.
-        let Some(imported_name) =
-            semantic.resolve_qualified_import_name(symbol.module, symbol.member)
-        else {
-            return Ok(None);
-        };
+        let imported_name = semantic.resolve_qualified_import_name(symbol.module, symbol.member)?;
 
         // If the symbol source (i.e., the import statement) comes after the current location,
         // abort. For example, we could be generating an edit within a function, and the import
@@ -197,13 +195,13 @@ impl<'a> Importer<'a> {
         // unclear whether should add an import statement at the start of the file, since it could
         // be shadowed between the import and the current location.
         if imported_name.start() > at {
-            return Err(ResolutionError::ImportAfterUsage);
+            return Some(Err(ResolutionError::ImportAfterUsage));
         }
 
         // If the symbol source (i.e., the import statement) is in a typing-only context, but we're
         // in a runtime context, abort.
         if imported_name.context().is_typing() && semantic.execution_context().is_runtime() {
-            return Err(ResolutionError::IncompatibleContext);
+            return Some(Err(ResolutionError::IncompatibleContext));
         }
 
         // We also add a no-op edit to force conflicts with any other fixes that might try to
@@ -226,7 +224,7 @@ impl<'a> Importer<'a> {
             self.locator.slice(imported_name.range()).to_string(),
             imported_name.range(),
         );
-        Ok(Some((import_edit, imported_name.into_name())))
+        Some(Ok((import_edit, imported_name.into_name())))
     }
 
     /// Generate an [`Edit`] to reference the given symbol. Returns the [`Edit`] necessary to make
@@ -321,7 +319,7 @@ impl<'a> Importer<'a> {
 
     /// Add the given member to an existing `Stmt::ImportFrom` statement.
     fn add_member(&self, stmt: &Stmt, member: &str) -> Result<Edit> {
-        let mut statement = match_statement(self.locator.slice(stmt))?;
+        let mut statement = match_statement(self.locator.slice(stmt.range()))?;
         let import_from = match_import_from(&mut statement)?;
         let aliases = match_aliases(import_from)?;
         aliases.push(ImportAlias {