[ty] Emit unresolved-attribute diagnostics in annotated assignments

.gitattributes

@@ -5,9 +5,6 @@ crates/ruff_linter/resources/test/fixtures/pycodestyle/W605_1.py text eol=crlf
 crates/ruff_linter/resources/test/fixtures/pycodestyle/W391_2.py text eol=crlf
 crates/ruff_linter/resources/test/fixtures/pycodestyle/W391_3.py text eol=crlf
 
-crates/ruff_python_formatter/resources/test/fixtures/ruff/f-string-carriage-return-newline.py text eol=crlf
-crates/ruff_python_formatter/tests/snapshots/format@f-string-carriage-return-newline.py.snap text eol=crlf
-
 crates/ruff_python_formatter/resources/test/fixtures/ruff/docstring_code_examples_crlf.py text eol=crlf
 crates/ruff_python_formatter/tests/snapshots/format@docstring_code_examples_crlf.py.snap text eol=crlf
 

.github/workflows/build-docker.yml

@@ -79,7 +79,7 @@ jobs:
       # Adapted from https://docs.docker.com/build/ci/github-actions/multi-platform/
       - name: Build and push by digest
         id: build
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
         with:
           context: .
           platforms: ${{ matrix.platform }}
@@ -231,7 +231,7 @@ jobs:
             ${{ env.TAG_PATTERNS }}
 
       - name: Build and push
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
         with:
           context: .
           platforms: linux/amd64,linux/arm64

.github/workflows/ci.yaml

@@ -237,13 +237,13 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
-        uses: rui314/setup-mold@b3958095189f34b95d402a680b6e96b7f194f7b9 # v1
+        uses: rui314/setup-mold@67424c1b3680e35255d95971cbd5de0047bf31c3 # v1
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
+        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
         with:
           tool: cargo-nextest
       - name: "Install cargo insta"
-        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
+        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
         with:
           tool: cargo-insta
       - name: ty mdtests (GitHub annotations)
@@ -295,13 +295,13 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
-        uses: rui314/setup-mold@b3958095189f34b95d402a680b6e96b7f194f7b9 # v1
+        uses: rui314/setup-mold@67424c1b3680e35255d95971cbd5de0047bf31c3 # v1
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
+        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
         with:
           tool: cargo-nextest
       - name: "Install cargo insta"
-        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
+        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
         with:
           tool: cargo-insta
       - name: "Run tests"
@@ -324,7 +324,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
+        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
         with:
           tool: cargo-nextest
       - name: "Run tests"
@@ -380,7 +380,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
-        uses: rui314/setup-mold@b3958095189f34b95d402a680b6e96b7f194f7b9 # v1
+        uses: rui314/setup-mold@67424c1b3680e35255d95971cbd5de0047bf31c3 # v1
       - name: "Build"
         run: cargo build --release --locked
 
@@ -405,13 +405,13 @@ jobs:
           MSRV: ${{ steps.msrv.outputs.value }}
         run: rustup default "${MSRV}"
       - name: "Install mold"
-        uses: rui314/setup-mold@b3958095189f34b95d402a680b6e96b7f194f7b9 # v1
+        uses: rui314/setup-mold@67424c1b3680e35255d95971cbd5de0047bf31c3 # v1
       - name: "Install cargo nextest"
-        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
+        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
         with:
           tool: cargo-nextest
       - name: "Install cargo insta"
-        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
+        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
         with:
           tool: cargo-insta
       - name: "Run tests"
@@ -437,7 +437,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install cargo-binstall"
-        uses: cargo-bins/cargo-binstall@ea65a39d2dcca142c53bddd3a097a674e903f475 # v1.12.7
+        uses: cargo-bins/cargo-binstall@5cbf019d8cb9b9d5b086218c41458ea35d817691 # v1.12.5
         with:
           tool: cargo-fuzz@0.11.2
       - name: "Install cargo-fuzz"
@@ -690,7 +690,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: cargo-bins/cargo-binstall@ea65a39d2dcca142c53bddd3a097a674e903f475 # v1.12.7
+      - uses: cargo-bins/cargo-binstall@5cbf019d8cb9b9d5b086218c41458ea35d817691 # v1.12.5
       - run: cargo binstall --no-confirm cargo-shear
       - run: cargo shear
 
@@ -910,7 +910,7 @@ jobs:
         run: rustup show
 
       - name: "Install codspeed"
-        uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
+        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
         with:
           tool: cargo-codspeed
 

.github/workflows/daily_fuzz.yaml

@@ -38,7 +38,7 @@ jobs:
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install mold"
-        uses: rui314/setup-mold@b3958095189f34b95d402a680b6e96b7f194f7b9 # v1
+        uses: rui314/setup-mold@67424c1b3680e35255d95971cbd5de0047bf31c3 # v1
       - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
       - name: Build ruff
         # A debug build means the script runs slower once it gets started,

.github/workflows/release.yml

@@ -61,7 +61,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
+      - uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
         with:
           persist-credentials: false
           submodules: recursive
@@ -124,7 +124,7 @@ jobs:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
     steps:
-      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
+      - uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
         with:
           persist-credentials: false
           submodules: recursive
@@ -175,7 +175,7 @@ jobs:
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
-      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
+      - uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
         with:
           persist-credentials: false
           submodules: recursive
@@ -251,7 +251,7 @@ jobs:
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@09d2acae674a48949e3602304ab46fd20ae0c42f
+      - uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
         with:
           persist-credentials: false
           submodules: recursive

.github/workflows/sync_typeshed.yaml

@@ -60,7 +60,7 @@ jobs:
           cd ruff
           git push --force origin typeshedbot/sync-typeshed
           gh pr list --repo "$GITHUB_REPOSITORY" --head typeshedbot/sync-typeshed --json id --jq length | grep 1 && exit 0 # exit if there is existing pr
-          gh pr create --title "[ty] Sync vendored typeshed stubs" --body "Close and reopen this PR to trigger CI" --label "ty"
+          gh pr create --title "Sync vendored typeshed stubs" --body "Close and reopen this PR to trigger CI" --label "internal"
 
   create-issue-on-failure:
     name: Create an issue if the typeshed sync failed

.pre-commit-config.yaml

@@ -5,7 +5,6 @@ exclude: |
     .github/workflows/release.yml|
     crates/ty_vendored/vendor/.*|
     crates/ty_project/resources/.*|
-    crates/ty_python_semantic/resources/corpus/.*|
     crates/ty/docs/(configuration|rules|cli).md|
     crates/ruff_benchmark/resources/.*|
     crates/ruff_linter/resources/.*|
@@ -67,7 +66,7 @@ repos:
           - black==25.1.0
 
   - repo: https://github.com/crate-ci/typos
-    rev: v1.33.1
+    rev: v1.32.0
     hooks:
       - id: typos
 
@@ -81,7 +80,7 @@ repos:
         pass_filenames: false # This makes it a lot faster
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.13
+    rev: v0.11.11
     hooks:
       - id: ruff-format
       - id: ruff
@@ -99,7 +98,7 @@ repos:
   # zizmor detects security vulnerabilities in GitHub Actions workflows.
   # Additional configuration for the tool is found in `.github/zizmor.yml`
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.9.0
+    rev: v1.8.0
     hooks:
       - id: zizmor
 

BREAKING_CHANGES.md

@@ -1,39 +1,5 @@
 # Breaking Changes
 
-## 0.12.0
-
-- **Detection of more syntax errors**
-
-    Ruff now detects version-related syntax errors, such as the use of the `match`
-    statement on Python versions before 3.10, and syntax errors emitted by
-    CPython's compiler, such as irrefutable `match` patterns before the final
-    `case` arm.
-
-- **New default Python version handling for syntax errors**
-
-    Ruff will default to the _latest_ supported Python version (3.13) when
-    checking for the version-related syntax errors mentioned above to prevent
-    false positives in projects without a Python version configured. The default
-    in all other cases, like applying lint rules, is unchanged and remains at the
-    minimum supported Python version (3.9).
-
-- **Updated f-string formatting**
-
-    Ruff now formats multi-line f-strings with format specifiers to avoid adding a
-    line break after the format specifier. This addresses a change to the Python
-    grammar in version 3.13.4 that made such a line break a syntax error.
-
-- **`rust-toolchain.toml` is no longer included in source distributions**
-
-    The `rust-toolchain.toml` is used to specify a higher Rust version than Ruff's
-    minimum supported Rust version (MSRV) for development and building release
-    artifacts. However, when present in source distributions, it would also cause
-    downstream package maintainers to pull in the same Rust toolchain, even if
-    their available toolchain was MSRV-compatible.
-
-- **[`suspicious-xmle-tree-usage`](https://docs.astral.sh/ruff/rules/suspicious-xmle-tree-usage/)
-    (`S320`) has been removed**
-
 ## 0.11.0
 
 This is a follow-up to release 0.10.0. Because of a mistake in the release process, the `requires-python` inference changes were not included in that release. Ruff 0.11.0 now includes this change as well as the stabilization of the preview behavior for `PGH004`.

CHANGELOG.md

@@ -1,199 +1,5 @@
 # Changelog
 
-## 0.12.0
-
-Check out the [blog post](https://astral.sh/blog/ruff-v0.12.0) for a migration
-guide and overview of the changes!
-
-### Breaking changes
-
-- **Detection of more syntax errors**
-
-    Ruff now detects version-related syntax errors, such as the use of the `match`
-    statement on Python versions before 3.10, and syntax errors emitted by
-    CPython's compiler, such as irrefutable `match` patterns before the final
-    `case` arm.
-
-- **New default Python version handling for syntax errors**
-
-    Ruff will default to the _latest_ supported Python version (3.13) when
-    checking for the version-related syntax errors mentioned above to prevent
-    false positives in projects without a Python version configured. The default
-    in all other cases, like applying lint rules, is unchanged and remains at the
-    minimum supported Python version (3.9).
-
-- **Updated f-string formatting**
-
-    Ruff now formats multi-line f-strings with format specifiers to avoid adding a
-    line break after the format specifier. This addresses a change to the Python
-    grammar in version 3.13.4 that made such a line break a syntax error.
-
-- **`rust-toolchain.toml` is no longer included in source distributions**
-
-    The `rust-toolchain.toml` is used to specify a higher Rust version than Ruff's
-    minimum supported Rust version (MSRV) for development and building release
-    artifacts. However, when present in source distributions, it would also cause
-    downstream package maintainers to pull in the same Rust toolchain, even if
-    their available toolchain was MSRV-compatible.
-
-### Removed Rules
-
-The following rules have been removed:
-
-- [`suspicious-xmle-tree-usage`](https://docs.astral.sh/ruff/rules/suspicious-xmle-tree-usage/)
-    (`S320`)
-
-### Deprecated Rules
-
-The following rules have been deprecated:
-
-- [`pandas-df-variable-name`](https://docs.astral.sh/ruff/rules/pandas-df-variable-name/)
-
-### Stabilization
-
-The following rules have been stabilized and are no longer in preview:
-
-- [`for-loop-writes`](https://docs.astral.sh/ruff/rules/for-loop-writes) (`FURB122`)
-- [`check-and-remove-from-set`](https://docs.astral.sh/ruff/rules/check-and-remove-from-set) (`FURB132`)
-- [`verbose-decimal-constructor`](https://docs.astral.sh/ruff/rules/verbose-decimal-constructor) (`FURB157`)
-- [`fromisoformat-replace-z`](https://docs.astral.sh/ruff/rules/fromisoformat-replace-z) (`FURB162`)
-- [`int-on-sliced-str`](https://docs.astral.sh/ruff/rules/int-on-sliced-str) (`FURB166`)
-- [`exc-info-outside-except-handler`](https://docs.astral.sh/ruff/rules/exc-info-outside-except-handler) (`LOG014`)
-- [`import-outside-top-level`](https://docs.astral.sh/ruff/rules/import-outside-top-level) (`PLC0415`)
-- [`unnecessary-dict-index-lookup`](https://docs.astral.sh/ruff/rules/unnecessary-dict-index-lookup) (`PLR1733`)
-- [`nan-comparison`](https://docs.astral.sh/ruff/rules/nan-comparison) (`PLW0177`)
-- [`eq-without-hash`](https://docs.astral.sh/ruff/rules/eq-without-hash) (`PLW1641`)
-- [`pytest-parameter-with-default-argument`](https://docs.astral.sh/ruff/rules/pytest-parameter-with-default-argument) (`PT028`)
-- [`pytest-warns-too-broad`](https://docs.astral.sh/ruff/rules/pytest-warns-too-broad) (`PT030`)
-- [`pytest-warns-with-multiple-statements`](https://docs.astral.sh/ruff/rules/pytest-warns-with-multiple-statements) (`PT031`)
-- [`invalid-formatter-suppression-comment`](https://docs.astral.sh/ruff/rules/invalid-formatter-suppression-comment) (`RUF028`)
-- [`dataclass-enum`](https://docs.astral.sh/ruff/rules/dataclass-enum) (`RUF049`)
-- [`class-with-mixed-type-vars`](https://docs.astral.sh/ruff/rules/class-with-mixed-type-vars) (`RUF053`)
-- [`unnecessary-round`](https://docs.astral.sh/ruff/rules/unnecessary-round) (`RUF057`)
-- [`starmap-zip`](https://docs.astral.sh/ruff/rules/starmap-zip) (`RUF058`)
-- [`non-pep604-annotation-optional`](https://docs.astral.sh/ruff/rules/non-pep604-annotation-optional) (`UP045`)
-- [`non-pep695-generic-class`](https://docs.astral.sh/ruff/rules/non-pep695-generic-class) (`UP046`)
-- [`non-pep695-generic-function`](https://docs.astral.sh/ruff/rules/non-pep695-generic-function) (`UP047`)
-- [`private-type-parameter`](https://docs.astral.sh/ruff/rules/private-type-parameter) (`UP049`)
-
-The following behaviors have been stabilized:
-
-- [`collection-literal-concatenation`] (`RUF005`) now recognizes slices, in
-    addition to list literals and variables.
-- The fix for [`readlines-in-for`] (`FURB129`) is now marked as always safe.
-- [`if-else-block-instead-of-if-exp`] (`SIM108`) will now further simplify
-    expressions to use `or` instead of an `if` expression, where possible.
-- [`unused-noqa`] (`RUF100`) now checks for file-level `noqa` comments as well
-    as inline comments.
-- [`subprocess-without-shell-equals-true`] (`S603`) now accepts literal strings,
-    as well as lists and tuples of literal strings, as trusted input.
-- [`boolean-type-hint-positional-argument`] (`FBT001`) now applies to types that
-    include `bool`, like `bool | int` or `typing.Optional[bool]`, in addition to
-    plain `bool` annotations.
-- [`non-pep604-annotation-union`] (`UP007`) has now been split into two rules.
-    `UP007` now applies only to `typing.Union`, while
-    [`non-pep604-annotation-optional`] (`UP045`) checks for use of
-    `typing.Optional`. `UP045` has also been stabilized in this release, but you
-    may need to update existing `include`, `ignore`, or `noqa` settings to
-    accommodate this change.
-
-### Preview features
-
-- \[`ruff`\] Check for non-context-manager use of `pytest.raises`, `pytest.warns`, and `pytest.deprecated_call` (`RUF061`) ([#17368](https://github.com/astral-sh/ruff/pull/17368))
-- [syntax-errors] Raise unsupported syntax error for template strings prior to Python 3.14 ([#18664](https://github.com/astral-sh/ruff/pull/18664))
-
-### Bug fixes
-
-- Add syntax error when conversion flag does not immediately follow exclamation mark ([#18706](https://github.com/astral-sh/ruff/pull/18706))
-- Add trailing space around `readlines` ([#18542](https://github.com/astral-sh/ruff/pull/18542))
-- Fix `\r` and `\r\n` handling in t- and f-string debug texts ([#18673](https://github.com/astral-sh/ruff/pull/18673))
-- Hug closing `}` when f-string expression has a format specifier ([#18704](https://github.com/astral-sh/ruff/pull/18704))
-- \[`flake8-pyi`\] Avoid syntax error in the case of starred and keyword arguments (`PYI059`) ([#18611](https://github.com/astral-sh/ruff/pull/18611))
-- \[`flake8-return`\] Fix `RET504` autofix generating a syntax error ([#18428](https://github.com/astral-sh/ruff/pull/18428))
-- \[`pep8-naming`\] Suppress fix for `N804` and `N805` if the recommended name is already used ([#18472](https://github.com/astral-sh/ruff/pull/18472))
-- \[`pycodestyle`\] Avoid causing a syntax error in expressions spanning multiple lines (`E731`) ([#18479](https://github.com/astral-sh/ruff/pull/18479))
-- \[`pyupgrade`\] Suppress `UP008` if `super` is shadowed ([#18688](https://github.com/astral-sh/ruff/pull/18688))
-- \[`refurb`\] Parenthesize lambda and ternary expressions (`FURB122`, `FURB142`) ([#18592](https://github.com/astral-sh/ruff/pull/18592))
-- \[`ruff`\] Handle extra arguments to `deque` (`RUF037`) ([#18614](https://github.com/astral-sh/ruff/pull/18614))
-- \[`ruff`\] Preserve parentheses around `deque` in fix for `unnecessary-empty-iterable-within-deque-call` (`RUF037`) ([#18598](https://github.com/astral-sh/ruff/pull/18598))
-- \[`ruff`\] Validate arguments before offering a fix (`RUF056`) ([#18631](https://github.com/astral-sh/ruff/pull/18631))
-- \[`ruff`\] Skip fix for `RUF059` if dummy name is already bound ([#18509](https://github.com/astral-sh/ruff/pull/18509))
-- \[`pylint`\] Fix `PLW0128` to check assignment targets in square brackets and after asterisks ([#18665](https://github.com/astral-sh/ruff/pull/18665))
-
-### Rule changes
-
-- Fix false positive on mutations in `return` statements (`B909`) ([#18408](https://github.com/astral-sh/ruff/pull/18408))
-- Treat `ty:` comments as pragma comments ([#18532](https://github.com/astral-sh/ruff/pull/18532))
-- \[`flake8-pyi`\] Apply `custom-typevar-for-self` to string annotations (`PYI019`) ([#18311](https://github.com/astral-sh/ruff/pull/18311))
-- \[`pyupgrade`\] Don't offer a fix for `Optional[None]` (`UP007`, `UP045)` ([#18545](https://github.com/astral-sh/ruff/pull/18545))
-- \[`pyupgrade`\] Fix `super(__class__, self)` detection (`UP008`) ([#18478](https://github.com/astral-sh/ruff/pull/18478))
-- \[`refurb`\] Make the fix for `FURB163` unsafe for `log2`, `log10`, `*args`, and deleted comments ([#18645](https://github.com/astral-sh/ruff/pull/18645))
-
-### Server
-
-- Support cancellation requests ([#18627](https://github.com/astral-sh/ruff/pull/18627))
-
-### Documentation
-
-- Drop confusing second `*` from glob pattern example for `per-file-target-version` ([#18709](https://github.com/astral-sh/ruff/pull/18709))
-- Update Neovim configuration examples ([#18491](https://github.com/astral-sh/ruff/pull/18491))
-- \[`pylint`\] De-emphasize `__hash__ = Parent.__hash__` (`PLW1641`) ([#18613](https://github.com/astral-sh/ruff/pull/18613))
-- \[`refurb`\] Add a note about float literal handling (`FURB157`) ([#18615](https://github.com/astral-sh/ruff/pull/18615))
-
-## 0.11.13
-
-### Preview features
-
-- \[`airflow`\] Add unsafe fix for module moved cases (`AIR301`,`AIR311`,`AIR312`,`AIR302`) ([#18367](https://github.com/astral-sh/ruff/pull/18367),[#18366](https://github.com/astral-sh/ruff/pull/18366),[#18363](https://github.com/astral-sh/ruff/pull/18363),[#18093](https://github.com/astral-sh/ruff/pull/18093))
-- \[`refurb`\] Add coverage of `set` and `frozenset` calls (`FURB171`) ([#18035](https://github.com/astral-sh/ruff/pull/18035))
-- \[`refurb`\] Mark `FURB180` fix unsafe when class has bases ([#18149](https://github.com/astral-sh/ruff/pull/18149))
-
-### Bug fixes
-
-- \[`perflint`\] Fix missing parentheses for lambda and ternary conditions (`PERF401`, `PERF403`) ([#18412](https://github.com/astral-sh/ruff/pull/18412))
-- \[`pyupgrade`\] Apply `UP035` only on py313+ for `get_type_hints()` ([#18476](https://github.com/astral-sh/ruff/pull/18476))
-- \[`pyupgrade`\] Make fix unsafe if it deletes comments (`UP004`,`UP050`) ([#18393](https://github.com/astral-sh/ruff/pull/18393), [#18390](https://github.com/astral-sh/ruff/pull/18390))
-
-### Rule changes
-
-- \[`fastapi`\] Avoid false positive for class dependencies (`FAST003`) ([#18271](https://github.com/astral-sh/ruff/pull/18271))
-
-### Documentation
-
-- Update editor setup docs for Neovim and Vim ([#18324](https://github.com/astral-sh/ruff/pull/18324))
-
-### Other changes
-
-- Support Python 3.14 template strings (t-strings) in formatter and parser ([#17851](https://github.com/astral-sh/ruff/pull/17851))
-
-## 0.11.12
-
-### Preview features
-
-- \[`airflow`\] Revise fix titles (`AIR3`) ([#18215](https://github.com/astral-sh/ruff/pull/18215))
-- \[`pylint`\] Implement `missing-maxsplit-arg` (`PLC0207`) ([#17454](https://github.com/astral-sh/ruff/pull/17454))
-- \[`pyupgrade`\] New rule `UP050` (`useless-class-metaclass-type`) ([#18334](https://github.com/astral-sh/ruff/pull/18334))
-- \[`flake8-use-pathlib`\] Replace `os.symlink` with `Path.symlink_to` (`PTH211`) ([#18337](https://github.com/astral-sh/ruff/pull/18337))
-
-### Bug fixes
-
-- \[`flake8-bugbear`\] Ignore `__debug__` attribute in `B010` ([#18357](https://github.com/astral-sh/ruff/pull/18357))
-- \[`flake8-async`\] Fix `anyio.sleep` argument name (`ASYNC115`, `ASYNC116`) ([#18262](https://github.com/astral-sh/ruff/pull/18262))
-- \[`refurb`\] Fix `FURB129` autofix generating invalid syntax ([#18235](https://github.com/astral-sh/ruff/pull/18235))
-
-### Rule changes
-
-- \[`flake8-implicit-str-concat`\] Add autofix for `ISC003` ([#18256](https://github.com/astral-sh/ruff/pull/18256))
-- \[`pycodestyle`\] Improve the diagnostic message for `E712` ([#18328](https://github.com/astral-sh/ruff/pull/18328))
-- \[`flake8-2020`\] Fix diagnostic message for `!=` comparisons (`YTT201`) ([#18293](https://github.com/astral-sh/ruff/pull/18293))
-- \[`pyupgrade`\] Make fix unsafe if it deletes comments (`UP010`) ([#18291](https://github.com/astral-sh/ruff/pull/18291))
-
-### Documentation
-
-- Simplify rules table to improve readability ([#18297](https://github.com/astral-sh/ruff/pull/18297))
-- Update editor integrations link in README ([#17977](https://github.com/astral-sh/ruff/pull/17977))
-- \[`flake8-bugbear`\] Add fix safety section (`B006`) ([#17652](https://github.com/astral-sh/ruff/pull/17652))
-
 ## 0.11.11
 
 ### Preview features
@@ -370,7 +176,7 @@ The following behaviors have been stabilized:
 - \[`airflow`\] Add missing `AIR302` attribute check ([#17115](https://github.com/astral-sh/ruff/pull/17115))
 - \[`airflow`\] Expand module path check to individual symbols (`AIR302`) ([#17278](https://github.com/astral-sh/ruff/pull/17278))
 - \[`airflow`\] Extract `AIR312` from `AIR302` rules (`AIR302`, `AIR312`) ([#17152](https://github.com/astral-sh/ruff/pull/17152))
-- \[`airflow`\] Update outdated `AIR301`, `AIR302` rules ([#17123](https://github.com/astral-sh/ruff/pull/17123))
+- \[`airflow`\] Update oudated `AIR301`, `AIR302` rules ([#17123](https://github.com/astral-sh/ruff/pull/17123))
 - [syntax-errors] Async comprehension in sync comprehension ([#17177](https://github.com/astral-sh/ruff/pull/17177))
 - [syntax-errors] Check annotations in annotated assignments ([#17283](https://github.com/astral-sh/ruff/pull/17283))
 - [syntax-errors] Extend annotation checks to `await` ([#17282](https://github.com/astral-sh/ruff/pull/17282))
@@ -531,7 +337,7 @@ See also, the "Remapped rules" section which may result in disabled rules.
 
 - **More robust noqa parsing** ([#16483](https://github.com/astral-sh/ruff/pull/16483))
 
-    The syntax for both file-level and in-line suppression comments has been unified and made more robust to certain errors. In most cases, this will result in more suppression comments being read by Ruff, but there are a few instances where previously read comments will now log an error to the user instead. Please refer to the documentation on [_Error suppression_](https://docs.astral.sh/ruff/linter/#error-suppression) for the full specification.
+    The syntax for both file-level and in-line suppression comments has been unified and made more robust to certain errors. In most cases, this will result in more suppression comments being read by Ruff, but there are a few instances where previously read comments will now log an error to the user instead. Please refer to the documentation on [*Error suppression*](https://docs.astral.sh/ruff/linter/#error-suppression) for the full specification.
 
 - **Avoid unnecessary parentheses around with statements with a single context manager and a trailing comment** ([#14005](https://github.com/astral-sh/ruff/pull/14005))
 
@@ -1453,7 +1259,7 @@ The following fixes have been stabilized:
 - Detect items that hash to same value in duplicate sets (`B033`, `PLC0208`) ([#14064](https://github.com/astral-sh/ruff/pull/14064))
 - \[`eradicate`\] Better detection of IntelliJ language injection comments (`ERA001`) ([#14094](https://github.com/astral-sh/ruff/pull/14094))
 - \[`flake8-pyi`\] Add autofix for `docstring-in-stub` (`PYI021`) ([#14150](https://github.com/astral-sh/ruff/pull/14150))
-- \[`flake8-pyi`\] Update `duplicate-literal-member` (`PYI062`) to always provide an autofix ([#14188](https://github.com/astral-sh/ruff/pull/14188))
+- \[`flake8-pyi`\] Update `duplicate-literal-member` (`PYI062`) to alawys provide an autofix ([#14188](https://github.com/astral-sh/ruff/pull/14188))
 - \[`pyflakes`\] Detect items that hash to same value in duplicate dictionaries (`F601`) ([#14065](https://github.com/astral-sh/ruff/pull/14065))
 - \[`ruff`\] Fix false positive for decorators (`RUF028`) ([#14061](https://github.com/astral-sh/ruff/pull/14061))
 
@@ -1943,7 +1749,7 @@ The following fixes have been stabilized:
 
 ## 0.5.6
 
-Ruff 0.5.6 automatically enables linting and formatting of notebooks in _preview mode_.
+Ruff 0.5.6 automatically enables linting and formatting of notebooks in *preview mode*.
 You can opt-out of this behavior by adding `*.ipynb` to the `extend-exclude` setting.
 
 ```toml
@@ -2696,7 +2502,7 @@ To setup `ruff server` with your editor, refer to the [README.md](https://github
 
 ### Server
 
-_This section is devoted to updates for our new language server, written in Rust._
+*This section is devoted to updates for our new language server, written in Rust.*
 
 - Enable ruff-specific source actions ([#10916](https://github.com/astral-sh/ruff/pull/10916))
 - Refreshes diagnostics for open files when file configuration is changed ([#10988](https://github.com/astral-sh/ruff/pull/10988))
@@ -4103,7 +3909,7 @@ Read Ruff's new [versioning policy](https://docs.astral.sh/ruff/versioning/).
 - \[`refurb`\] Add `single-item-membership-test` (`FURB171`) ([#7815](https://github.com/astral-sh/ruff/pull/7815))
 - \[`pylint`\] Add `and-or-ternary` (`R1706`) ([#7811](https://github.com/astral-sh/ruff/pull/7811))
 
-_New rules are added in [preview](https://docs.astral.sh/ruff/preview/)._
+*New rules are added in [preview](https://docs.astral.sh/ruff/preview/).*
 
 ### Configuration
 
@@ -4178,12 +3984,3 @@ _New rules are added in [preview](https://docs.astral.sh/ruff/preview/)._
 ### Playground
 
 - Fix playground `Quick Fix` action ([#7824](https://github.com/astral-sh/ruff/pull/7824))
-
-[`boolean-type-hint-positional-argument`]: https://docs.astral.sh/ruff/rules/boolean-type-hint-positional-argument
-[`collection-literal-concatenation`]: https://docs.astral.sh/ruff/rules/collection-literal-concatenation
-[`if-else-block-instead-of-if-exp`]: https://docs.astral.sh/ruff/rules/if-else-block-instead-of-if-exp
-[`non-pep604-annotation-optional`]: https://docs.astral.sh/ruff/rules/non-pep604-annotation-optional
-[`non-pep604-annotation-union`]: https://docs.astral.sh/ruff/rules/non-pep604-annotation-union
-[`readlines-in-for`]: https://docs.astral.sh/ruff/rules/readlines-in-for
-[`subprocess-without-shell-equals-true`]: https://docs.astral.sh/ruff/rules/subprocess-without-shell-equals-true
-[`unused-noqa`]: https://docs.astral.sh/ruff/rules/unused-noqa

Cargo.lock

@@ -51,14 +51,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "710e8eae58854cdc1790fcb56cca04d712a17be849eeb81da2a724bf4bae2bc4"
 dependencies = [
  "anstyle",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
 name = "anstream"
-version = "0.6.19"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -71,9 +71,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.11"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-lossy"
@@ -112,7 +112,7 @@ dependencies = [
  "anstyle",
  "anstyle-lossy",
  "html-escape",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -132,12 +132,6 @@ version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
-[[package]]
-name = "arc-swap"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
-
 [[package]]
 name = "argfile"
 version = "0.2.1"
@@ -224,9 +218,9 @@ dependencies = [
 
 [[package]]
 name = "boxcar"
-version = "0.2.13"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26c4925bc979b677330a8c7fe7a8c94af2dbb4a2d37b4a20a80d884400f46baa"
+checksum = "66bb12751a83493ef4b8da1120451a262554e216a247f14b48cb5e8fe7ed8bdf"
 
 [[package]]
 name = "bstr"
@@ -262,9 +256,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.10"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
 dependencies = [
  "serde",
 ]
@@ -348,9 +342,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.40"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
+checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -358,9 +352,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.40"
+version = "4.5.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
+checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
 dependencies = [
  "anstream",
  "anstyle",
@@ -401,9 +395,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.40"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -492,7 +486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -501,7 +495,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -528,7 +522,7 @@ dependencies = [
  "encode_unicode",
  "libc",
  "once_cell",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.0",
  "windows-sys 0.59.0",
 ]
 
@@ -915,7 +909,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1115,9 +1109,9 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.4"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
+checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -1130,7 +1124,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown 0.15.4",
+ "hashbrown 0.15.3",
 ]
 
 [[package]]
@@ -1328,7 +1322,7 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17d34b7d42178945f775e84bc4c36dde7c1c6cdfea656d3354d009056f2bb3d2"
 dependencies = [
- "hashbrown 0.15.4",
+ "hashbrown 0.15.3",
 ]
 
 [[package]]
@@ -1348,7 +1342,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.4",
+ "hashbrown 0.15.3",
  "serde",
 ]
 
@@ -1361,7 +1355,7 @@ dependencies = [
  "console",
  "number_prefix",
  "portable-atomic",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.0",
  "vt100",
  "web-time",
 ]
@@ -1421,15 +1415,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "intrusive-collections"
-version = "0.9.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "189d0897e4cbe8c75efedf3502c18c887b05046e59d28404d4d8e46cbc4d1e86"
-dependencies = [
- "memoffset",
-]
-
 [[package]]
 name = "is-docker"
 version = "0.2.0"
@@ -1459,7 +1444,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
  "hermit-abi 0.5.1",
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1513,9 +1498,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jiff"
-version = "0.2.15"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
+checksum = "a194df1107f33c79f4f93d02c80798520551949d59dfad22b6157048a88cca93"
 dependencies = [
  "jiff-static",
  "jiff-tzdb-platform",
@@ -1523,14 +1508,14 @@ dependencies = [
  "portable-atomic",
  "portable-atomic-util",
  "serde",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "jiff-static"
-version = "0.2.15"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
+checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1606,15 +1591,15 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.173"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8cfeafaffdbc32176b64fb251369d52ea9f0a8fbc6f8759edffef7b525d64bb"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "libcst"
-version = "1.8.2"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae28ddc5b90c3e3146a21d051ca095cbc8d932ad8714cf65ddf71a9abb35684c"
+checksum = "ad9e315e3f679e61b9095ffd5e509de78b8a4ea3bba9d772f6fb243209f808d4"
 dependencies = [
  "annotate-snippets",
  "libcst_derive",
@@ -1622,14 +1607,14 @@ dependencies = [
  "paste",
  "peg",
  "regex",
- "thiserror 2.0.12",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "libcst_derive"
-version = "1.8.2"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc2de5c2f62bcf8a4f7290b1854388b262c4b68f1db1a3ee3ef6d4c1319b00a3"
+checksum = "bfa96ed35d0dccc67cf7ba49350cb86de3dcb1d072a7ab28f99117f19d874953"
 dependencies = [
  "quote",
  "syn",
@@ -1753,18 +1738,9 @@ checksum = "2f926ade0c4e170215ae43342bf13b9310a437609c81f29f86c5df6657582ef9"
 
 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
-
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "mimalloc"
@@ -1952,7 +1928,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d31b8b7a99f71bdff4235faf9ce9eada0ad3562c8fbeb7d607d9f41a6ec569d"
 dependencies = [
  "indexmap",
- "serde",
 ]
 
 [[package]]
@@ -2074,7 +2049,7 @@ checksum = "31095ca1f396e3de32745f42b20deef7bc09077f918b085307e8eab6ddd8fb9c"
 dependencies = [
  "once_cell",
  "serde",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.0",
  "unscanny",
  "version-ranges",
 ]
@@ -2095,7 +2070,7 @@ dependencies = [
  "serde",
  "smallvec",
  "thiserror 1.0.69",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.0",
  "url",
  "urlencoding",
  "version-ranges",
@@ -2283,15 +2258,15 @@ dependencies = [
 
 [[package]]
 name = "pyproject-toml"
-version = "0.13.5"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0f6160dc48298b9260d9b958ad1d7f96f6cd0b9df200b22329204e09334663"
+checksum = "643af57c3f36ba90a8b53e972727d8092f7408a9ebfbaf4c3d2c17b07c58d835"
 dependencies = [
  "indexmap",
  "pep440_rs",
  "pep508_rs",
  "serde",
- "thiserror 2.0.12",
+ "thiserror 1.0.69",
  "toml",
 ]
 
@@ -2510,7 +2485,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.12.0"
+version = "0.11.11"
 dependencies = [
  "anyhow",
  "argfile",
@@ -2579,7 +2554,7 @@ dependencies = [
  "snapbox",
  "toml",
  "tryfn",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -2619,7 +2594,6 @@ name = "ruff_db"
 version = "0.0.0"
 dependencies = [
  "anstyle",
- "arc-swap",
  "camino",
  "countme",
  "dashmap 6.1.0",
@@ -2668,6 +2642,7 @@ dependencies = [
  "rayon",
  "regex",
  "ruff",
+ "ruff_diagnostics",
  "ruff_formatter",
  "ruff_linter",
  "ruff_notebook",
@@ -2697,7 +2672,9 @@ dependencies = [
 name = "ruff_diagnostics"
 version = "0.0.0"
 dependencies = [
+ "anyhow",
  "is-macro",
+ "log",
  "ruff_text_size",
  "serde",
 ]
@@ -2715,7 +2692,7 @@ dependencies = [
  "serde",
  "static_assertions",
  "tracing",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.0",
 ]
 
 [[package]]
@@ -2748,7 +2725,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.12.0"
+version = "0.11.11"
 dependencies = [
  "aho-corasick",
  "anyhow",
@@ -2804,7 +2781,7 @@ dependencies = [
  "toml",
  "typed-arena",
  "unicode-normalization",
- "unicode-width 0.2.1",
+ "unicode-width 0.2.0",
  "unicode_names2",
  "url",
 ]
@@ -2865,7 +2842,6 @@ dependencies = [
  "salsa",
  "schemars",
  "serde",
- "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -3085,7 +3061,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_wasm"
-version = "0.12.0"
+version = "0.11.11"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -3187,7 +3163,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3204,17 +3180,16 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "salsa"
-version = "0.22.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=09627e450566f894956710a3fd923dc80462ae6d#09627e450566f894956710a3fd923dc80462ae6d"
+version = "0.21.1"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=4818b15f3b7516555d39f5a41cb75970448bee4c#4818b15f3b7516555d39f5a41cb75970448bee4c"
 dependencies = [
  "boxcar",
  "compact_str",
  "crossbeam-queue",
- "crossbeam-utils",
- "hashbrown 0.15.4",
+ "dashmap 6.1.0",
+ "hashbrown 0.15.3",
  "hashlink",
  "indexmap",
- "intrusive-collections",
  "parking_lot",
  "portable-atomic",
  "rayon",
@@ -3228,14 +3203,15 @@ dependencies = [
 
 [[package]]
 name = "salsa-macro-rules"
-version = "0.22.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=09627e450566f894956710a3fd923dc80462ae6d#09627e450566f894956710a3fd923dc80462ae6d"
+version = "0.21.1"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=4818b15f3b7516555d39f5a41cb75970448bee4c#4818b15f3b7516555d39f5a41cb75970448bee4c"
 
 [[package]]
 name = "salsa-macros"
-version = "0.22.0"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=09627e450566f894956710a3fd923dc80462ae6d#09627e450566f894956710a3fd923dc80462ae6d"
+version = "0.21.1"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=4818b15f3b7516555d39f5a41cb75970448bee4c#4818b15f3b7516555d39f5a41cb75970448bee4c"
 dependencies = [
+ "heck",
  "proc-macro2",
  "quote",
  "syn",
@@ -3354,9 +3330,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.9"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -3442,9 +3418,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "smallvec"
-version = "1.15.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
 
 [[package]]
 name = "snapbox"
@@ -3526,9 +3502,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.103"
+version = "2.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3556,7 +3532,7 @@ dependencies = [
  "getrandom 0.3.3",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3751,9 +3727,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "toml"
-version = "0.8.23"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -3763,18 +3739,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.11"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.27"
+version = "0.22.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
 dependencies = [
  "indexmap",
  "serde",
@@ -3786,9 +3762,9 @@ dependencies = [
 
 [[package]]
 name = "toml_write"
-version = "0.1.2"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
 
 [[package]]
 name = "tracing"
@@ -3899,7 +3875,6 @@ dependencies = [
  "countme",
  "crossbeam",
  "ctrlc",
- "dunce",
  "filetime",
  "indicatif",
  "insta",
@@ -3944,17 +3919,12 @@ name = "ty_project"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "camino",
- "colored 3.0.0",
  "crossbeam",
- "globset",
+ "glob",
  "insta",
  "notify",
- "ordermap",
  "pep440_rs",
  "rayon",
- "regex",
- "regex-automata 0.4.9",
  "ruff_cache",
  "ruff_db",
  "ruff_macros",
@@ -3981,13 +3951,11 @@ dependencies = [
  "anyhow",
  "bitflags 2.9.1",
  "camino",
- "colored 3.0.0",
  "compact_str",
  "countme",
  "dir-test",
  "drop_bomb",
- "glob",
- "hashbrown 0.15.4",
+ "hashbrown 0.15.3",
  "indexmap",
  "insta",
  "itertools 0.14.0",
@@ -3995,7 +3963,6 @@ dependencies = [
  "ordermap",
  "quickcheck",
  "quickcheck_macros",
- "ruff_annotate_snippets",
  "ruff_db",
  "ruff_index",
  "ruff_macros",
@@ -4018,7 +3985,6 @@ dependencies = [
  "test-case",
  "thiserror 2.0.12",
  "tracing",
- "ty_python_semantic",
  "ty_test",
  "ty_vendored",
 ]
@@ -4054,7 +4020,6 @@ name = "ty_test"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "bitflags 2.9.1",
  "camino",
  "colored 3.0.0",
  "insta",
@@ -4202,9 +4167,9 @@ checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-width"
-version = "0.2.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
 
 [[package]]
 name = "unicode_names2"
@@ -4561,7 +4526,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]

Cargo.toml

@@ -51,7 +51,6 @@ aho-corasick = { version = "1.1.3" }
 anstream = { version = "0.6.18" }
 anstyle = { version = "1.0.10" }
 anyhow = { version = "1.0.80" }
-arc-swap = { version = "1.7.1" }
 assert_fs = { version = "1.1.0" }
 argfile = { version = "0.2.0" }
 bincode = { version = "2.0.0" }
@@ -127,11 +126,10 @@ quote = { version = "1.0.23" }
 rand = { version = "0.9.0" }
 rayon = { version = "1.10.0" }
 regex = { version = "1.10.2" }
-regex-automata = { version = "0.4.9" }
 rustc-hash = { version = "2.0.0" }
 rustc-stable-hash = { version = "0.1.2" }
 # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
-salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "09627e450566f894956710a3fd923dc80462ae6d" }
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "4818b15f3b7516555d39f5a41cb75970448bee4c" }
 schemars = { version = "0.8.16" }
 seahash = { version = "4.1.0" }
 serde = { version = "1.0.197", features = ["derive"] }

README.md

@@ -148,8 +148,8 @@ curl -LsSf https://astral.sh/ruff/install.sh | sh
 powershell -c "irm https://astral.sh/ruff/install.ps1 | iex"
 
 # For a specific version.
-curl -LsSf https://astral.sh/ruff/0.12.0/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.12.0/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.11.11/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.11.11/install.ps1 | iex"
 ```
 
 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -182,7 +182,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.12.0
+  rev: v0.11.11
   hooks:
     # Run the linter.
     - id: ruff

_typos.toml

@@ -4,10 +4,6 @@ extend-exclude = [
     "crates/ty_vendored/vendor/**/*",
     "**/resources/**/*",
     "**/snapshots/**/*",
-    # Completion tests tend to have a lot of incomplete
-    # words naturally. It's annoying to have to make all
-    # of them actually words. So just ignore typos here.
-    "crates/ty_ide/src/completion.rs",
 ]
 
 [default.extend-words]

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.12.0"
+version = "0.11.11"
 publish = true
 authors = { workspace = true }
 edition = { workspace = true }

crates/ruff/src/cache.rs

@@ -349,6 +349,7 @@ impl FileCache {
                     .iter()
                     .map(|msg| {
                         Message::diagnostic(
+                            msg.rule.into(),
                             msg.body.clone(),
                             msg.suggestion.clone(),
                             msg.range,
@@ -356,7 +357,6 @@ impl FileCache {
                             msg.parent,
                             file.clone(),
                             msg.noqa_offset,
-                            msg.rule,
                         )
                     })
                     .collect()
@@ -439,10 +439,7 @@ impl LintCacheData {
 
         let messages = messages
             .iter()
-            // Parse the kebab-case rule name into a `Rule`. This will fail for syntax errors, so
-            // this also serves to filter them out, but we shouldn't be caching files with syntax
-            // errors anyway.
-            .filter_map(|msg| Some((msg.name().parse().ok()?, msg)))
+            .filter_map(|msg| msg.to_rule().map(|rule| (rule, msg)))
             .map(|(rule, msg)| {
                 // Make sure that all message use the same source file.
                 assert_eq!(

crates/ruff/src/commands/check.rs

@@ -12,7 +12,7 @@ use rayon::prelude::*;
 use rustc_hash::FxHashMap;
 
 use ruff_db::panic::catch_unwind;
-use ruff_linter::OldDiagnostic;
+use ruff_diagnostics::Diagnostic;
 use ruff_linter::message::Message;
 use ruff_linter::package::PackageRoot;
 use ruff_linter::registry::Rule;
@@ -131,7 +131,8 @@ pub(crate) fn check(
 
                     Diagnostics::new(
                         vec![Message::from_diagnostic(
-                            OldDiagnostic::new(IOError { message }, TextRange::default(), &dummy),
+                            Diagnostic::new(IOError { message }, TextRange::default()),
+                            dummy,
                             None,
                         )],
                         FxHashMap::default(),

crates/ruff/src/commands/rule.rs

@@ -6,7 +6,7 @@ use serde::ser::SerializeSeq;
 use serde::{Serialize, Serializer};
 use strum::IntoEnumIterator;
 
-use ruff_linter::FixAvailability;
+use ruff_diagnostics::FixAvailability;
 use ruff_linter::registry::{Linter, Rule, RuleNamespace};
 
 use crate::args::HelpFormat;
@@ -30,7 +30,7 @@ impl<'a> Explanation<'a> {
         let (linter, _) = Linter::parse_code(&code).unwrap();
         let fix = rule.fixable().to_string();
         Self {
-            name: rule.name().as_str(),
+            name: rule.as_ref(),
             code,
             linter: linter.name(),
             summary: rule.message_formats()[0],
@@ -44,7 +44,7 @@ impl<'a> Explanation<'a> {
 
 fn format_rule_text(rule: Rule) -> String {
     let mut output = String::new();
-    let _ = write!(&mut output, "# {} ({})", rule.name(), rule.noqa_code());
+    let _ = write!(&mut output, "# {} ({})", rule.as_ref(), rule.noqa_code());
     output.push('\n');
     output.push('\n');
 

crates/ruff/src/commands/server.rs

@@ -1,7 +1,14 @@
+use std::num::NonZeroUsize;
+
 use crate::ExitStatus;
 use anyhow::Result;
+use ruff_server::Server;
 
-pub(crate) fn run_server(preview: Option<bool>) -> Result<ExitStatus> {
-    ruff_server::run(preview)?;
-    Ok(ExitStatus::Success)
+pub(crate) fn run_server(
+    worker_threads: NonZeroUsize,
+    preview: Option<bool>,
+) -> Result<ExitStatus> {
+    let server = Server::new(worker_threads, preview)?;
+
+    server.run().map(|()| ExitStatus::Success)
 }

crates/ruff/src/diagnostics.rs

@@ -12,7 +12,7 @@ use colored::Colorize;
 use log::{debug, warn};
 use rustc_hash::FxHashMap;
 
-use ruff_linter::OldDiagnostic;
+use ruff_diagnostics::Diagnostic;
 use ruff_linter::codes::Rule;
 use ruff_linter::linter::{FixTable, FixerResult, LinterResult, ParseSource, lint_fix, lint_only};
 use ruff_linter::message::Message;
@@ -64,13 +64,13 @@ impl Diagnostics {
                     let source_file = SourceFileBuilder::new(name, "").finish();
                     Self::new(
                         vec![Message::from_diagnostic(
-                            OldDiagnostic::new(
+                            Diagnostic::new(
                                 IOError {
                                     message: err.to_string(),
                                 },
                                 TextRange::default(),
-                                &source_file,
                             ),
+                            source_file,
                             None,
                         )],
                         FxHashMap::default(),
@@ -165,9 +165,9 @@ impl AddAssign for FixMap {
                 continue;
             }
             let fixed_in_file = self.0.entry(filename).or_default();
-            for (rule, name, count) in fixed.iter() {
+            for (rule, count) in fixed {
                 if count > 0 {
-                    *fixed_in_file.entry(rule).or_default(name) += count;
+                    *fixed_in_file.entry(rule).or_default() += count;
                 }
             }
         }
@@ -235,7 +235,7 @@ pub(crate) fn lint_path(
                     };
                     let source_file =
                         SourceFileBuilder::new(path.to_string_lossy(), contents).finish();
-                    lint_pyproject_toml(&source_file, settings)
+                    lint_pyproject_toml(source_file, settings)
                 } else {
                     vec![]
                 };
@@ -305,7 +305,7 @@ pub(crate) fn lint_path(
                     ParseSource::None,
                 );
                 let transformed = source_kind;
-                let fixed = FixTable::default();
+                let fixed = FxHashMap::default();
                 (result, transformed, fixed)
             }
         } else {
@@ -319,7 +319,7 @@ pub(crate) fn lint_path(
                 ParseSource::None,
             );
             let transformed = source_kind;
-            let fixed = FixTable::default();
+            let fixed = FxHashMap::default();
             (result, transformed, fixed)
         };
 
@@ -396,7 +396,7 @@ pub(crate) fn lint_stdin(
                 }
 
                 return Ok(Diagnostics {
-                    messages: lint_pyproject_toml(&source_file, &settings.linter),
+                    messages: lint_pyproject_toml(source_file, &settings.linter),
                     fixed: FixMap::from_iter([(fs::relativize_path(path), FixTable::default())]),
                     notebook_indexes: FxHashMap::default(),
                 });
@@ -473,7 +473,7 @@ pub(crate) fn lint_stdin(
                 }
 
                 let transformed = source_kind;
-                let fixed = FixTable::default();
+                let fixed = FxHashMap::default();
                 (result, transformed, fixed)
             }
         } else {
@@ -487,7 +487,7 @@ pub(crate) fn lint_stdin(
                 ParseSource::None,
             );
             let transformed = source_kind;
-            let fixed = FixTable::default();
+            let fixed = FxHashMap::default();
             (result, transformed, fixed)
         };
 

crates/ruff/src/lib.rs

@@ -2,6 +2,7 @@
 
 use std::fs::File;
 use std::io::{self, BufWriter, Write, stdout};
+use std::num::NonZeroUsize;
 use std::path::{Path, PathBuf};
 use std::process::ExitCode;
 use std::sync::mpsc::channel;
@@ -222,7 +223,13 @@ fn analyze_graph(
 }
 
 fn server(args: ServerCommand) -> Result<ExitStatus> {
-    commands::server::run_server(args.resolve_preview())
+    let four = NonZeroUsize::new(4).unwrap();
+
+    // by default, we set the number of worker threads to `num_cpus`, with a maximum of 4.
+    let worker_threads = std::thread::available_parallelism()
+        .unwrap_or(four)
+        .min(four);
+    commands::server::run_server(worker_threads, args.resolve_preview())
 }
 
 pub fn check(args: CheckCommand, global_options: GlobalConfigArgs) -> Result<ExitStatus> {

crates/ruff/src/printer.rs

@@ -7,7 +7,6 @@ use bitflags::bitflags;
 use colored::Colorize;
 use itertools::{Itertools, iterate};
 use ruff_linter::codes::NoqaCode;
-use ruff_linter::linter::FixTable;
 use serde::Serialize;
 
 use ruff_linter::fs::relativize_path;
@@ -81,7 +80,7 @@ impl Printer {
             let fixed = diagnostics
                 .fixed
                 .values()
-                .flat_map(FixTable::counts)
+                .flat_map(std::collections::HashMap::values)
                 .sum::<usize>();
 
             if self.flags.intersects(Flags::SHOW_VIOLATIONS) {
@@ -303,7 +302,7 @@ impl Printer {
         let statistics: Vec<ExpandedStatistics> = diagnostics
             .messages
             .iter()
-            .map(|message| (message.noqa_code(), message))
+            .map(|message| (message.to_noqa_code(), message))
             .sorted_by_key(|(code, message)| (*code, message.fixable()))
             .fold(
                 vec![],
@@ -473,13 +472,13 @@ fn show_fix_status(fix_mode: flags::FixMode, fixables: Option<&FixableStatistics
 fn print_fix_summary(writer: &mut dyn Write, fixed: &FixMap) -> Result<()> {
     let total = fixed
         .values()
-        .map(|table| table.counts().sum::<usize>())
+        .map(|table| table.values().sum::<usize>())
         .sum::<usize>();
     assert!(total > 0);
     let num_digits = num_digits(
-        fixed
+        *fixed
             .values()
-            .filter_map(|table| table.counts().max())
+            .filter_map(|table| table.values().max())
             .max()
             .unwrap(),
     );
@@ -499,11 +498,12 @@ fn print_fix_summary(writer: &mut dyn Write, fixed: &FixMap) -> Result<()> {
             relativize_path(filename).bold(),
             ":".cyan()
         )?;
-        for (code, name, count) in table.iter().sorted_by_key(|(.., count)| Reverse(*count)) {
+        for (rule, count) in table.iter().sorted_by_key(|(.., count)| Reverse(*count)) {
             writeln!(
                 writer,
-                "    {count:>num_digits$} × {code} ({name})",
-                code = code.to_string().red().bold(),
+                "    {count:>num_digits$} × {} ({})",
+                rule.noqa_code().to_string().red().bold(),
+                rule.as_ref(),
             )?;
         }
     }

crates/ruff/tests/analyze_graph.rs

@@ -566,7 +566,7 @@ fn venv() -> Result<()> {
         ----- stderr -----
         ruff failed
           Cause: Invalid search path settings
-          Cause: Failed to discover the site-packages directory: Invalid `--python` argument `none`: does not point to a Python executable or a directory on disk
+          Cause: Failed to discover the site-packages directory: Invalid `--python` argument: `none` could not be canonicalized
         ");
     });
 

crates/ruff/tests/lint.rs

@@ -5436,15 +5436,14 @@ match 2:
         print("it's one")
 "#
         ),
-        @r###"
-    success: false
-    exit_code: 1
+        @r"
+    success: true
+    exit_code: 0
     ----- stdout -----
-    test.py:2:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
-    Found 1 error.
+    All checks passed!
 
     ----- stderr -----
-    "###
+    "
     );
 
     // syntax error on 3.9 with preview

crates/ruff_benchmark/benches/ty.rs

@@ -78,7 +78,7 @@ fn setup_tomllib_case() -> Case {
 
     let src_root = SystemPath::new("/src");
     let mut metadata = ProjectMetadata::discover(src_root, &system).unwrap();
-    metadata.apply_options(Options {
+    metadata.apply_cli_options(Options {
         environment: Some(EnvironmentOptions {
             python_version: Some(RangedValue::cli(PythonVersion::PY312)),
             ..EnvironmentOptions::default()
@@ -224,7 +224,7 @@ fn setup_micro_case(code: &str) -> Case {
 
     let src_root = SystemPath::new("/src");
     let mut metadata = ProjectMetadata::discover(src_root, &system).unwrap();
-    metadata.apply_options(Options {
+    metadata.apply_cli_options(Options {
         environment: Some(EnvironmentOptions {
             python_version: Some(RangedValue::cli(PythonVersion::PY312)),
             ..EnvironmentOptions::default()

crates/ruff_db/Cargo.toml

@@ -21,7 +21,6 @@ ruff_source_file = { workspace = true }
 ruff_text_size = { workspace = true }
 
 anstyle = { workspace = true }
-arc-swap = { workspace = true }
 camino = { workspace = true }
 countme = { workspace = true }
 dashmap = { workspace = true }

crates/ruff_db/src/diagnostic/mod.rs

@@ -665,76 +665,6 @@ pub enum DiagnosticId {
 
     /// No rule with the given name exists.
     UnknownRule,
-
-    /// A glob pattern doesn't follow the expected syntax.
-    InvalidGlob,
-
-    /// An `include` glob without any patterns.
-    ///
-    /// ## Why is this bad?
-    /// An `include` glob without any patterns won't match any files. This is probably a mistake and
-    /// either the `include` should be removed or a pattern should be added.
-    ///
-    /// ## Example
-    /// ```toml
-    /// [src]
-    /// include = []
-    /// ```
-    ///
-    /// Use instead:
-    ///
-    /// ```toml
-    /// [src]
-    /// include = ["src"]
-    /// ```
-    ///
-    /// or remove the `include` option.
-    EmptyInclude,
-
-    /// An override configuration is unnecessary because it applies to all files.
-    ///
-    /// ## Why is this bad?
-    /// An overrides section that applies to all files is probably a mistake and can be rolled-up into the root configuration.
-    ///
-    /// ## Example
-    /// ```toml
-    /// [[overrides]]
-    /// [overrides.rules]
-    /// unused-reference = "ignore"
-    /// ```
-    ///
-    /// Use instead:
-    ///
-    /// ```toml
-    /// [rules]
-    /// unused-reference = "ignore"
-    /// ```
-    ///
-    /// or
-    ///
-    /// ```toml
-    /// [[overrides]]
-    /// include = ["test"]
-    ///
-    /// [overrides.rules]
-    /// unused-reference = "ignore"
-    /// ```
-    UnnecessaryOverridesSection,
-
-    /// An `overrides` section in the configuration that doesn't contain any overrides.
-    ///
-    /// ## Why is this bad?
-    /// An `overrides` section without any configuration overrides is probably a mistake.
-    /// It is either a leftover after removing overrides, or a user forgot to add any overrides,
-    /// or used an incorrect syntax to do so (e.g. used `rules` instead of `overrides.rules`).
-    ///
-    /// ## Example
-    /// ```toml
-    /// [[overrides]]
-    /// include = ["test"]
-    /// # no `[overrides.rules]`
-    /// ```
-    UselessOverridesSection,
 }
 
 impl DiagnosticId {
@@ -769,10 +699,6 @@ impl DiagnosticId {
             DiagnosticId::Lint(name) => name.as_str(),
             DiagnosticId::RevealedType => "revealed-type",
             DiagnosticId::UnknownRule => "unknown-rule",
-            DiagnosticId::InvalidGlob => "invalid-glob",
-            DiagnosticId::EmptyInclude => "empty-include",
-            DiagnosticId::UnnecessaryOverridesSection => "unnecessary-overrides-section",
-            DiagnosticId::UselessOverridesSection => "useless-overrides-section",
         }
     }
 

crates/ruff_db/src/diagnostic/render.rs

@@ -265,7 +265,7 @@ impl<'a> ResolvedDiagnostic<'a> {
                 .get();
                 // The boundary case here is when `prev_context_ends`
                 // is exactly one less than `this_context_begins`. In
-                // that case, the context windows are adjacent and we
+                // that case, the context windows are adajcent and we
                 // should fall through below to add this annotation to
                 // the existing snippet.
                 if this_context_begins.saturating_sub(prev_context_ends) > 1 {
@@ -754,7 +754,7 @@ kangaroo
     static FRUITS: &str = "\
 apple
 banana
-cantaloupe
+cantelope
 lime
 orange
 pear
@@ -1376,8 +1376,8 @@ watermelon
           |
         1 | apple
         2 | banana
-        3 | cantaloupe
-          | ^^^^^^^^^^
+        3 | cantelope
+          | ^^^^^^^^^
         4 | lime
         5 | orange
           |
@@ -1479,8 +1479,8 @@ watermelon
           |
         1 | apple
         2 | banana
-        3 | cantaloupe
-          | ^^^^^^^^^^
+        3 | cantelope
+          | ^^^^^^^^^
         4 | lime
         5 | orange
           |
@@ -1515,8 +1515,8 @@ watermelon
           |
         1 | apple
         2 | banana
-        3 | cantaloupe
-          | ^^^^^^^^^^
+        3 | cantelope
+          | ^^^^^^^^^
         4 | lime
         5 | orange
           |
@@ -1562,8 +1562,8 @@ watermelon
           |
         1 | apple
         2 | banana
-        3 | cantaloupe
-          | ^^^^^^^^^^
+        3 | cantelope
+          | ^^^^^^^^^
         4 | lime
         5 | orange
           |
@@ -2040,7 +2040,7 @@ watermelon
         1 | apple
           | ^^^^^ primary
         2 | banana
-        3 | cantaloupe
+        3 | cantelope
           |
          ::: animals:1:1
           |

crates/ruff_db/src/lib.rs

@@ -59,13 +59,6 @@ pub fn max_parallelism() -> NonZeroUsize {
         })
 }
 
-/// Trait for types that can provide Rust documentation.
-///
-/// Use `derive(RustDoc)` to automatically implement this trait for types that have a static string documentation.
-pub trait RustDoc {
-    fn rust_doc() -> &'static str;
-}
-
 #[cfg(test)]
 mod tests {
     use std::sync::{Arc, Mutex};

crates/ruff_db/src/parsed.rs

@@ -1,8 +1,8 @@
 use std::fmt::Formatter;
+use std::ops::Deref;
 use std::sync::Arc;
 
-use arc_swap::ArcSwapOption;
-use ruff_python_ast::{AnyRootNodeRef, ModModule, NodeIndex};
+use ruff_python_ast::ModModule;
 use ruff_python_parser::{ParseOptions, Parsed, parse_unchecked};
 
 use crate::Db;
@@ -18,86 +18,48 @@ use crate::source::source_text;
 /// The query is only cached when the [`source_text()`] hasn't changed. This is because
 /// comparing two ASTs is a non-trivial operation and every offset change is directly
 /// reflected in the changed AST offsets.
-/// The other reason is that Ruff's AST doesn't implement `Eq` which Salsa requires
+/// The other reason is that Ruff's AST doesn't implement `Eq` which Sala requires
 /// for determining if a query result is unchanged.
 #[salsa::tracked(returns(ref), no_eq)]
 pub fn parsed_module(db: &dyn Db, file: File) -> ParsedModule {
     let _span = tracing::trace_span!("parsed_module", ?file).entered();
 
-    let parsed = parsed_module_impl(db, file);
-
-    ParsedModule::new(file, parsed)
-}
-
-pub fn parsed_module_impl(db: &dyn Db, file: File) -> Parsed<ModModule> {
     let source = source_text(db, file);
     let ty = file.source_type(db);
 
     let target_version = db.python_version();
     let options = ParseOptions::from(ty).with_target_version(target_version);
-    parse_unchecked(&source, options)
+    let parsed = parse_unchecked(&source, options)
         .try_into_module()
-        .expect("PySourceType always parses into a module")
+        .expect("PySourceType always parses into a module");
+
+    ParsedModule::new(parsed)
 }
 
-/// A wrapper around a parsed module.
-///
-/// This type manages instances of the module AST. A particular instance of the AST
-/// is represented with the [`ParsedModuleRef`] type.
+/// Cheap cloneable wrapper around the parsed module.
 #[derive(Clone)]
 pub struct ParsedModule {
-    file: File,
-    inner: Arc<ArcSwapOption<indexed::IndexedModule>>,
+    inner: Arc<Parsed<ModModule>>,
 }
 
 impl ParsedModule {
-    pub fn new(file: File, parsed: Parsed<ModModule>) -> Self {
+    pub fn new(parsed: Parsed<ModModule>) -> Self {
         Self {
-            file,
-            inner: Arc::new(ArcSwapOption::new(Some(indexed::IndexedModule::new(
-                parsed,
-            )))),
-        }
-    }
-    /// Loads a reference to the parsed module.
-    ///
-    /// Note that holding on to the reference will prevent garbage collection
-    /// of the AST. This method will reparse the module if it has been collected.
-    pub fn load(&self, db: &dyn Db) -> ParsedModuleRef {
-        let parsed = match self.inner.load_full() {
-            Some(parsed) => parsed,
-            None => {
-                // Re-parse the file.
-                let parsed = indexed::IndexedModule::new(parsed_module_impl(db, self.file));
-                tracing::debug!(
-                    "File `{}` was reparsed after being collected in the current Salsa revision",
-                    self.file.path(db)
-                );
-
-                self.inner.store(Some(parsed.clone()));
-                parsed
-            }
-        };
-
-        ParsedModuleRef {
-            module: self.clone(),
-            indexed: parsed,
+            inner: Arc::new(parsed),
         }
     }
 
-    /// Clear the parsed module, dropping the AST once all references to it are dropped.
-    pub fn clear(&self) {
-        self.inner.store(None);
+    /// Consumes `self` and returns the Arc storing the parsed module.
+    pub fn into_arc(self) -> Arc<Parsed<ModModule>> {
+        self.inner
     }
+}
 
-    /// Returns a pointer for this [`ParsedModule`].
-    ///
-    /// The pointer uniquely identifies the module within the current Salsa revision,
-    /// regardless of whether particular [`ParsedModuleRef`] instances are garbage collected.
-    pub fn as_ptr(&self) -> *const () {
-        // Note that the outer `Arc` in `inner` is stable across garbage collection, while the inner
-        // `Arc` within the `ArcSwap` may change.
-        Arc::as_ptr(&self.inner).cast()
+impl Deref for ParsedModule {
+    type Target = Parsed<ModModule>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
     }
 }
 
@@ -115,273 +77,6 @@ impl PartialEq for ParsedModule {
 
 impl Eq for ParsedModule {}
 
-/// Cheap cloneable wrapper around an instance of a module AST.
-#[derive(Clone)]
-pub struct ParsedModuleRef {
-    module: ParsedModule,
-    indexed: Arc<indexed::IndexedModule>,
-}
-
-impl ParsedModuleRef {
-    /// Returns a reference to the [`ParsedModule`] that this instance was loaded from.
-    pub fn module(&self) -> &ParsedModule {
-        &self.module
-    }
-
-    /// Returns a reference to the AST node at the given index.
-    pub fn get_by_index<'ast>(&'ast self, index: NodeIndex) -> AnyRootNodeRef<'ast> {
-        self.indexed.get_by_index(index)
-    }
-}
-
-impl std::ops::Deref for ParsedModuleRef {
-    type Target = Parsed<ModModule>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.indexed.parsed
-    }
-}
-
-mod indexed {
-    use std::sync::Arc;
-
-    use ruff_python_ast::visitor::source_order::*;
-    use ruff_python_ast::*;
-    use ruff_python_parser::Parsed;
-
-    /// A wrapper around the AST that allows access to AST nodes by index.
-    #[derive(Debug)]
-    pub struct IndexedModule {
-        index: Box<[AnyRootNodeRef<'static>]>,
-        pub parsed: Parsed<ModModule>,
-    }
-
-    impl IndexedModule {
-        /// Create a new [`IndexedModule`] from the given AST.
-        #[allow(clippy::unnecessary_cast)]
-        pub fn new(parsed: Parsed<ModModule>) -> Arc<Self> {
-            let mut visitor = Visitor {
-                nodes: Vec::new(),
-                index: 0,
-            };
-
-            let mut inner = Arc::new(IndexedModule {
-                parsed,
-                index: Box::new([]),
-            });
-
-            AnyNodeRef::from(inner.parsed.syntax()).visit_source_order(&mut visitor);
-
-            let index: Box<[AnyRootNodeRef<'_>]> = visitor.nodes.into_boxed_slice();
-
-            // SAFETY: We cast from `Box<[AnyRootNodeRef<'_>]>` to `Box<[AnyRootNodeRef<'static>]>`,
-            // faking the 'static lifetime to create the self-referential struct. The node references
-            // are into the `Arc<Parsed<ModModule>>`, so are valid for as long as the `IndexedModule`
-            // is alive. We make sure to restore the correct lifetime in `get_by_index`.
-            //
-            // Note that we can never move the data within the `Arc` after this point.
-            Arc::get_mut(&mut inner).unwrap().index =
-                unsafe { Box::from_raw(Box::into_raw(index) as *mut [AnyRootNodeRef<'static>]) };
-
-            inner
-        }
-
-        /// Returns the node at the given index.
-        pub fn get_by_index<'ast>(&'ast self, index: NodeIndex) -> AnyRootNodeRef<'ast> {
-            // Note that this method restores the correct lifetime: the nodes are valid for as
-            // long as the reference to `IndexedModule` is alive.
-            self.index[index.as_usize()]
-        }
-    }
-
-    /// A visitor that collects nodes in source order.
-    pub struct Visitor<'a> {
-        pub index: u32,
-        pub nodes: Vec<AnyRootNodeRef<'a>>,
-    }
-
-    impl<'a> Visitor<'a> {
-        fn visit_node<T>(&mut self, node: &'a T)
-        where
-            T: HasNodeIndex + std::fmt::Debug,
-            AnyRootNodeRef<'a>: From<&'a T>,
-        {
-            node.node_index().set(self.index);
-            self.nodes.push(AnyRootNodeRef::from(node));
-            self.index += 1;
-        }
-    }
-
-    impl<'a> SourceOrderVisitor<'a> for Visitor<'a> {
-        #[inline]
-        fn visit_mod(&mut self, module: &'a Mod) {
-            self.visit_node(module);
-            walk_module(self, module);
-        }
-
-        #[inline]
-        fn visit_stmt(&mut self, stmt: &'a Stmt) {
-            self.visit_node(stmt);
-            walk_stmt(self, stmt);
-        }
-
-        #[inline]
-        fn visit_annotation(&mut self, expr: &'a Expr) {
-            self.visit_node(expr);
-            walk_annotation(self, expr);
-        }
-
-        #[inline]
-        fn visit_expr(&mut self, expr: &'a Expr) {
-            self.visit_node(expr);
-            walk_expr(self, expr);
-        }
-
-        #[inline]
-        fn visit_decorator(&mut self, decorator: &'a Decorator) {
-            self.visit_node(decorator);
-            walk_decorator(self, decorator);
-        }
-
-        #[inline]
-        fn visit_comprehension(&mut self, comprehension: &'a Comprehension) {
-            self.visit_node(comprehension);
-            walk_comprehension(self, comprehension);
-        }
-
-        #[inline]
-        fn visit_except_handler(&mut self, except_handler: &'a ExceptHandler) {
-            self.visit_node(except_handler);
-            walk_except_handler(self, except_handler);
-        }
-
-        #[inline]
-        fn visit_arguments(&mut self, arguments: &'a Arguments) {
-            self.visit_node(arguments);
-            walk_arguments(self, arguments);
-        }
-
-        #[inline]
-        fn visit_parameters(&mut self, parameters: &'a Parameters) {
-            self.visit_node(parameters);
-            walk_parameters(self, parameters);
-        }
-
-        #[inline]
-        fn visit_parameter(&mut self, arg: &'a Parameter) {
-            self.visit_node(arg);
-            walk_parameter(self, arg);
-        }
-
-        fn visit_parameter_with_default(
-            &mut self,
-            parameter_with_default: &'a ParameterWithDefault,
-        ) {
-            self.visit_node(parameter_with_default);
-            walk_parameter_with_default(self, parameter_with_default);
-        }
-
-        #[inline]
-        fn visit_keyword(&mut self, keyword: &'a Keyword) {
-            self.visit_node(keyword);
-            walk_keyword(self, keyword);
-        }
-
-        #[inline]
-        fn visit_alias(&mut self, alias: &'a Alias) {
-            self.visit_node(alias);
-            walk_alias(self, alias);
-        }
-
-        #[inline]
-        fn visit_with_item(&mut self, with_item: &'a WithItem) {
-            self.visit_node(with_item);
-            walk_with_item(self, with_item);
-        }
-
-        #[inline]
-        fn visit_type_params(&mut self, type_params: &'a TypeParams) {
-            self.visit_node(type_params);
-            walk_type_params(self, type_params);
-        }
-
-        #[inline]
-        fn visit_type_param(&mut self, type_param: &'a TypeParam) {
-            self.visit_node(type_param);
-            walk_type_param(self, type_param);
-        }
-
-        #[inline]
-        fn visit_match_case(&mut self, match_case: &'a MatchCase) {
-            self.visit_node(match_case);
-            walk_match_case(self, match_case);
-        }
-
-        #[inline]
-        fn visit_pattern(&mut self, pattern: &'a Pattern) {
-            self.visit_node(pattern);
-            walk_pattern(self, pattern);
-        }
-
-        #[inline]
-        fn visit_pattern_arguments(&mut self, pattern_arguments: &'a PatternArguments) {
-            self.visit_node(pattern_arguments);
-            walk_pattern_arguments(self, pattern_arguments);
-        }
-
-        #[inline]
-        fn visit_pattern_keyword(&mut self, pattern_keyword: &'a PatternKeyword) {
-            self.visit_node(pattern_keyword);
-            walk_pattern_keyword(self, pattern_keyword);
-        }
-
-        #[inline]
-        fn visit_elif_else_clause(&mut self, elif_else_clause: &'a ElifElseClause) {
-            self.visit_node(elif_else_clause);
-            walk_elif_else_clause(self, elif_else_clause);
-        }
-
-        #[inline]
-        fn visit_f_string(&mut self, f_string: &'a FString) {
-            self.visit_node(f_string);
-            walk_f_string(self, f_string);
-        }
-
-        #[inline]
-        fn visit_interpolated_string_element(
-            &mut self,
-            interpolated_string_element: &'a InterpolatedStringElement,
-        ) {
-            self.visit_node(interpolated_string_element);
-            walk_interpolated_string_element(self, interpolated_string_element);
-        }
-
-        #[inline]
-        fn visit_t_string(&mut self, t_string: &'a TString) {
-            self.visit_node(t_string);
-            walk_t_string(self, t_string);
-        }
-
-        #[inline]
-        fn visit_string_literal(&mut self, string_literal: &'a StringLiteral) {
-            self.visit_node(string_literal);
-            walk_string_literal(self, string_literal);
-        }
-
-        #[inline]
-        fn visit_bytes_literal(&mut self, bytes_literal: &'a BytesLiteral) {
-            self.visit_node(bytes_literal);
-            walk_bytes_literal(self, bytes_literal);
-        }
-
-        #[inline]
-        fn visit_identifier(&mut self, identifier: &'a Identifier) {
-            self.visit_node(identifier);
-            walk_identifier(self, identifier);
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use crate::Db;
@@ -403,7 +98,7 @@ mod tests {
 
         let file = system_path_to_file(&db, path).unwrap();
 
-        let parsed = parsed_module(&db, file).load(&db);
+        let parsed = parsed_module(&db, file);
 
         assert!(parsed.has_valid_syntax());
 
@@ -419,7 +114,7 @@ mod tests {
 
         let file = system_path_to_file(&db, path).unwrap();
 
-        let parsed = parsed_module(&db, file).load(&db);
+        let parsed = parsed_module(&db, file);
 
         assert!(parsed.has_valid_syntax());
 
@@ -435,7 +130,7 @@ mod tests {
 
         let virtual_file = db.files().virtual_file(&db, path);
 
-        let parsed = parsed_module(&db, virtual_file.file()).load(&db);
+        let parsed = parsed_module(&db, virtual_file.file());
 
         assert!(parsed.has_valid_syntax());
 
@@ -451,7 +146,7 @@ mod tests {
 
         let virtual_file = db.files().virtual_file(&db, path);
 
-        let parsed = parsed_module(&db, virtual_file.file()).load(&db);
+        let parsed = parsed_module(&db, virtual_file.file());
 
         assert!(parsed.has_valid_syntax());
 
@@ -482,7 +177,7 @@ else:
 
         let file = vendored_path_to_file(&db, VendoredPath::new("path.pyi")).unwrap();
 
-        let parsed = parsed_module(&db, file).load(&db);
+        let parsed = parsed_module(&db, file);
 
         assert!(parsed.has_valid_syntax());
     }

crates/ruff_db/src/system.rs

@@ -171,21 +171,6 @@ pub trait System: Debug {
         PatternError,
     >;
 
-    /// Fetches the environment variable `key` from the current process.
-    ///
-    /// # Errors
-    ///
-    /// Returns [`std::env::VarError::NotPresent`] if:
-    /// - The variable is not set.
-    /// - The variable's name contains an equal sign or NUL (`'='` or `'\0'`).
-    ///
-    /// Returns [`std::env::VarError::NotUnicode`] if the variable's value is not valid
-    /// Unicode.
-    fn env_var(&self, name: &str) -> std::result::Result<String, std::env::VarError> {
-        let _ = name;
-        Err(std::env::VarError::NotPresent)
-    }
-
     fn as_any(&self) -> &dyn std::any::Any;
 
     fn as_any_mut(&mut self) -> &mut dyn std::any::Any;

crates/ruff_db/src/system/os.rs

@@ -214,10 +214,6 @@ impl System for OsSystem {
             })
         })))
     }
-
-    fn env_var(&self, name: &str) -> std::result::Result<String, std::env::VarError> {
-        std::env::var(name)
-    }
 }
 
 impl OsSystem {

crates/ruff_db/src/system/path.rs

@@ -45,30 +45,6 @@ impl SystemPath {
         SystemPath::from_std_path(dunce::simplified(self.as_std_path())).unwrap()
     }
 
-    /// Returns `true` if the `SystemPath` is absolute, i.e., if it is independent of
-    /// the current directory.
-    ///
-    /// * On Unix, a path is absolute if it starts with the root, so
-    ///   `is_absolute` and [`has_root`] are equivalent.
-    ///
-    /// * On Windows, a path is absolute if it has a prefix and starts with the
-    ///   root: `c:\windows` is absolute, while `c:temp` and `\temp` are not.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use ruff_db::system::SystemPath;
-    ///
-    /// assert!(!SystemPath::new("foo.txt").is_absolute());
-    /// ```
-    ///
-    /// [`has_root`]: Utf8Path::has_root
-    #[inline]
-    #[must_use]
-    pub fn is_absolute(&self) -> bool {
-        self.0.is_absolute()
-    }
-
     /// Extracts the file extension, if possible.
     ///
     /// The extension is:
@@ -562,10 +538,6 @@ impl SystemPathBuf {
         self.0.into_std_path_buf()
     }
 
-    pub fn into_string(self) -> String {
-        self.0.into_string()
-    }
-
     #[inline]
     pub fn as_path(&self) -> &SystemPath {
         SystemPath::new(&self.0)
@@ -624,13 +596,6 @@ impl AsRef<SystemPath> for Utf8PathBuf {
     }
 }
 
-impl AsRef<SystemPath> for camino::Utf8Component<'_> {
-    #[inline]
-    fn as_ref(&self) -> &SystemPath {
-        SystemPath::new(self.as_str())
-    }
-}
-
 impl AsRef<SystemPath> for str {
     #[inline]
     fn as_ref(&self) -> &SystemPath {
@@ -661,22 +626,6 @@ impl Deref for SystemPathBuf {
     }
 }
 
-impl<P: AsRef<SystemPath>> FromIterator<P> for SystemPathBuf {
-    fn from_iter<I: IntoIterator<Item = P>>(iter: I) -> Self {
-        let mut buf = SystemPathBuf::new();
-        buf.extend(iter);
-        buf
-    }
-}
-
-impl<P: AsRef<SystemPath>> Extend<P> for SystemPathBuf {
-    fn extend<I: IntoIterator<Item = P>>(&mut self, iter: I) {
-        for path in iter {
-            self.push(path);
-        }
-    }
-}
-
 impl std::fmt::Debug for SystemPath {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         self.0.fmt(f)

crates/ruff_db/src/testing.rs

@@ -13,12 +13,12 @@ pub fn assert_function_query_was_not_run<Db, Q, QDb, I, R>(
     Q: Fn(QDb, I) -> R,
     I: salsa::plumbing::AsId + std::fmt::Debug + Copy,
 {
-    let id = input.as_id();
+    let id = input.as_id().as_u32();
     let (query_name, will_execute_event) = find_will_execute_event(db, query, input, events);
 
     db.attach(|_| {
         if let Some(will_execute_event) = will_execute_event {
-            panic!("Expected query {query_name}({id:?}) not to have run but it did: {will_execute_event:?}\n\n{events:#?}");
+            panic!("Expected query {query_name}({id}) not to have run but it did: {will_execute_event:?}\n\n{events:#?}");
         }
     });
 }
@@ -65,7 +65,7 @@ pub fn assert_function_query_was_run<Db, Q, QDb, I, R>(
     Q: Fn(QDb, I) -> R,
     I: salsa::plumbing::AsId + std::fmt::Debug + Copy,
 {
-    let id = input.as_id();
+    let id = input.as_id().as_u32();
     let (query_name, will_execute_event) = find_will_execute_event(db, query, input, events);
 
     db.attach(|_| {
@@ -224,7 +224,7 @@ fn query_was_not_run() {
 }
 
 #[test]
-#[should_panic(expected = "Expected query len(Id(0)) not to have run but it did:")]
+#[should_panic(expected = "Expected query len(0) not to have run but it did:")]
 fn query_was_not_run_fails_if_query_was_run() {
     use crate::tests::TestDb;
     use salsa::prelude::*;
@@ -287,7 +287,7 @@ fn const_query_was_not_run_fails_if_query_was_run() {
 }
 
 #[test]
-#[should_panic(expected = "Expected query len(Id(0)) to have run but it did not:")]
+#[should_panic(expected = "Expected query len(0) to have run but it did not:")]
 fn query_was_run_fails_if_query_was_not_run() {
     use crate::tests::TestDb;
     use salsa::prelude::*;

crates/ruff_dev/Cargo.toml

@@ -14,6 +14,7 @@ license = { workspace = true }
 ty = { workspace = true }
 ty_project = { workspace = true, features = ["schemars"] }
 ruff = { workspace = true }
+ruff_diagnostics = { workspace = true }
 ruff_formatter = { workspace = true }
 ruff_linter = { workspace = true, features = ["schemars"] }
 ruff_notebook = { workspace = true }

crates/ruff_dev/src/generate_docs.rs

@@ -10,7 +10,7 @@ use itertools::Itertools;
 use regex::{Captures, Regex};
 use strum::IntoEnumIterator;
 
-use ruff_linter::FixAvailability;
+use ruff_diagnostics::FixAvailability;
 use ruff_linter::registry::{Linter, Rule, RuleNamespace};
 use ruff_options_metadata::{OptionEntry, OptionsMetadata};
 use ruff_workspace::options::Options;
@@ -29,7 +29,7 @@ pub(crate) fn main(args: &Args) -> Result<()> {
         if let Some(explanation) = rule.explanation() {
             let mut output = String::new();
 
-            let _ = writeln!(&mut output, "# {} ({})", rule.name(), rule.noqa_code());
+            let _ = writeln!(&mut output, "# {} ({})", rule.as_ref(), rule.noqa_code());
 
             let (linter, _) = Linter::parse_code(&rule.noqa_code().to_string()).unwrap();
             if linter.url().is_some() {
@@ -101,7 +101,7 @@ pub(crate) fn main(args: &Args) -> Result<()> {
             let filename = PathBuf::from(ROOT_DIR)
                 .join("docs")
                 .join("rules")
-                .join(&*rule.name())
+                .join(rule.as_ref())
                 .with_extension("md");
 
             if args.dry_run {

crates/ruff_dev/src/generate_rules_table.rs

@@ -8,7 +8,7 @@ use std::borrow::Cow;
 use std::fmt::Write;
 use strum::IntoEnumIterator;
 
-use ruff_linter::FixAvailability;
+use ruff_diagnostics::FixAvailability;
 use ruff_linter::registry::{Linter, Rule, RuleNamespace};
 use ruff_linter::upstream_categories::UpstreamCategoryAndPrefix;
 use ruff_options_metadata::OptionsMetadata;
@@ -55,7 +55,7 @@ fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>,
             FixAvailability::None => format!("<span {SYMBOL_STYLE}></span>"),
         };
 
-        let rule_name = rule.name();
+        let rule_name = rule.as_ref();
 
         // If the message ends in a bracketed expression (like: "Use {replacement}"), escape the
         // brackets. Otherwise, it'll be interpreted as an HTML attribute via the `attr_list`

crates/ruff_diagnostics/Cargo.toml

@@ -16,5 +16,7 @@ doctest = false
 [dependencies]
 ruff_text_size = { workspace = true }
 
+anyhow = { workspace = true }
+log = { workspace = true }
 is-macro = { workspace = true }
 serde = { workspace = true, optional = true, features = [] }

crates/ruff_diagnostics/src/diagnostic.rs

@@ -1,15 +1,14 @@
 use anyhow::Result;
 use log::debug;
 
-use ruff_source_file::SourceFile;
 use ruff_text_size::{Ranged, TextRange, TextSize};
 
-use crate::registry::AsRule;
-use crate::violation::Violation;
-use crate::{Fix, codes::Rule};
+use crate::{Fix, Violation};
 
 #[derive(Debug, PartialEq, Eq, Clone)]
-pub struct OldDiagnostic {
+pub struct Diagnostic {
+    /// The identifier of the diagnostic, used to align the diagnostic with a rule.
+    pub name: &'static str,
     /// The message body to display to the user, to explain the diagnostic.
     pub body: String,
     /// The message to display to the user, to explain the suggested fix.
@@ -17,27 +16,17 @@ pub struct OldDiagnostic {
     pub range: TextRange,
     pub fix: Option<Fix>,
     pub parent: Option<TextSize>,
-
-    pub(crate) rule: Rule,
-
-    pub(crate) file: SourceFile,
 }
 
-impl OldDiagnostic {
-    // TODO(brent) We temporarily allow this to avoid updating all of the call sites to add
-    // references. I expect this method to go away or change significantly with the rest of the
-    // diagnostic refactor, but if it still exists in this form at the end of the refactor, we
-    // should just update the call sites.
-    #[expect(clippy::needless_pass_by_value)]
-    pub fn new<T: Violation>(kind: T, range: TextRange, file: &SourceFile) -> Self {
+impl Diagnostic {
+    pub fn new<T: Violation>(kind: T, range: TextRange) -> Self {
         Self {
+            name: T::rule_name(),
             body: Violation::message(&kind),
             suggestion: Violation::fix_title(&kind),
             range,
             fix: None,
             parent: None,
-            rule: T::rule(),
-            file: file.clone(),
         }
     }
 
@@ -61,7 +50,7 @@ impl OldDiagnostic {
     pub fn try_set_fix(&mut self, func: impl FnOnce() -> Result<Fix>) {
         match func() {
             Ok(fix) => self.fix = Some(fix),
-            Err(err) => debug!("Failed to create fix for {}: {}", self.rule, err),
+            Err(err) => debug!("Failed to create fix for {}: {}", self.name, err),
         }
     }
 
@@ -72,7 +61,7 @@ impl OldDiagnostic {
         match func() {
             Ok(None) => {}
             Ok(Some(fix)) => self.fix = Some(fix),
-            Err(err) => debug!("Failed to create fix for {}: {}", self.rule, err),
+            Err(err) => debug!("Failed to create fix for {}: {}", self.name, err),
         }
     }
 
@@ -91,13 +80,7 @@ impl OldDiagnostic {
     }
 }
 
-impl AsRule for OldDiagnostic {
-    fn rule(&self) -> Rule {
-        self.rule
-    }
-}
-
-impl Ranged for OldDiagnostic {
+impl Ranged for Diagnostic {
     fn range(&self) -> TextRange {
         self.range
     }

crates/ruff_diagnostics/src/lib.rs

@@ -1,7 +1,11 @@
+pub use diagnostic::Diagnostic;
 pub use edit::Edit;
 pub use fix::{Applicability, Fix, IsolationLevel};
 pub use source_map::{SourceMap, SourceMarker};
+pub use violation::{AlwaysFixableViolation, FixAvailability, Violation, ViolationMetadata};
 
+mod diagnostic;
 mod edit;
 mod fix;
 mod source_map;
+mod violation;

crates/ruff_diagnostics/src/violation.rs

@@ -1,7 +1,5 @@
 use std::fmt::{Debug, Display};
 
-use crate::codes::Rule;
-
 #[derive(Debug, Copy, Clone)]
 pub enum FixAvailability {
     Sometimes,
@@ -20,8 +18,8 @@ impl Display for FixAvailability {
 }
 
 pub trait ViolationMetadata {
-    /// Returns the rule for this violation
-    fn rule() -> Rule;
+    /// Returns the rule name of this violation
+    fn rule_name() -> &'static str;
 
     /// Returns an explanation of what this violation catches,
     /// why it's bad, and what users should do instead.

crates/ruff_graph/src/collector.rs

@@ -39,7 +39,6 @@ impl<'ast> SourceOrderVisitor<'ast> for Collector<'_> {
                 module,
                 level,
                 range: _,
-                node_index: _,
             }) => {
                 let module = module.as_deref();
                 let level = *level;
@@ -79,11 +78,7 @@ impl<'ast> SourceOrderVisitor<'ast> for Collector<'_> {
                     }
                 }
             }
-            Stmt::Import(ast::StmtImport {
-                names,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::Import(ast::StmtImport { names, range: _ }) => {
                 for alias in names {
                     if let Some(module_name) = ModuleName::new(alias.name.as_str()) {
                         self.imports.push(CollectedImport::Import(module_name));
@@ -127,12 +122,7 @@ impl<'ast> SourceOrderVisitor<'ast> for Collector<'_> {
 
     fn visit_expr(&mut self, expr: &'ast Expr) {
         if self.string_imports {
-            if let Expr::StringLiteral(ast::ExprStringLiteral {
-                value,
-                range: _,
-                node_index: _,
-            }) = expr
-            {
+            if let Expr::StringLiteral(ast::ExprStringLiteral { value, range: _ }) = expr {
                 // Determine whether the string literal "looks like" an import statement: contains
                 // a dot, and consists solely of valid Python identifiers.
                 let value = value.to_str();

crates/ruff_graph/src/db.rs

@@ -10,7 +10,7 @@ use ruff_python_ast::PythonVersion;
 use ty_python_semantic::lint::{LintRegistry, RuleSelection};
 use ty_python_semantic::{
     Db, Program, ProgramSettings, PythonPath, PythonPlatform, PythonVersionSource,
-    PythonVersionWithSource, SearchPathSettings, SysPrefixPathOrigin, default_lint_registry,
+    PythonVersionWithSource, SearchPathSettings, default_lint_registry,
 };
 
 static EMPTY_VENDORED: std::sync::LazyLock<VendoredFileSystem> = std::sync::LazyLock::new(|| {
@@ -37,18 +37,17 @@ impl ModuleDb {
     ) -> Result<Self> {
         let mut search_paths = SearchPathSettings::new(src_roots);
         if let Some(venv_path) = venv_path {
-            search_paths.python_path =
-                PythonPath::sys_prefix(venv_path, SysPrefixPathOrigin::PythonCliFlag);
+            search_paths.python_path = PythonPath::from_cli_flag(venv_path);
         }
 
         let db = Self::default();
         Program::from_settings(
             &db,
             ProgramSettings {
-                python_version: Some(PythonVersionWithSource {
+                python_version: PythonVersionWithSource {
                     version: python_version,
                     source: PythonVersionSource::default(),
-                }),
+                },
                 python_platform: PythonPlatform::default(),
                 search_paths,
             },
@@ -92,7 +91,7 @@ impl Db for ModuleDb {
         !file.path(self).is_vendored_path()
     }
 
-    fn rule_selection(&self, _file: File) -> &RuleSelection {
+    fn rule_selection(&self) -> &RuleSelection {
         &self.rule_selection
     }
 

crates/ruff_linter/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_linter"
-version = "0.12.0"
+version = "0.11.11"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }

crates/ruff_linter/resources/test/fixtures/airflow/AIR301_names.py

@@ -10,10 +10,22 @@ from airflow import (
     PY312,
 )
 from airflow.api_connexion.security import requires_access
+from airflow.configuration import (
+    as_dict,
+    get,
+    getboolean,
+    getfloat,
+    getint,
+    has_option,
+    remove_option,
+    set,
+)
 from airflow.contrib.aws_athena_hook import AWSAthenaHook
 from airflow.datasets import DatasetAliasEvent
+from airflow.hooks.base_hook import BaseHook
 from airflow.operators.subdag import SubDagOperator
 from airflow.secrets.local_filesystem import LocalFilesystemBackend
+from airflow.sensors.base_sensor_operator import BaseSensorOperator
 from airflow.triggers.external_task import TaskStateTrigger
 from airflow.utils import dates
 from airflow.utils.dag_cycle_tester import test_cycle
@@ -28,10 +40,13 @@ from airflow.utils.dates import (
 )
 from airflow.utils.db import create_session
 from airflow.utils.decorators import apply_defaults
-from airflow.utils.file import mkdirs
+from airflow.utils.file import TemporaryDirectory, mkdirs
+from airflow.utils.helpers import chain as helper_chain
+from airflow.utils.helpers import cross_downstream as helper_cross_downstream
+from airflow.utils.log import secrets_masker
 from airflow.utils.state import SHUTDOWN, terminating_states
 from airflow.utils.trigger_rule import TriggerRule
-from airflow.www.auth import has_access, has_access_dataset
+from airflow.www.auth import has_access
 from airflow.www.utils import get_sensitive_variables_fields, should_hide_value_for_key
 
 # airflow root
@@ -40,6 +55,11 @@ PY36, PY37, PY38, PY39, PY310, PY311, PY312
 # airflow.api_connexion.security
 requires_access
 
+
+# airflow.configuration
+get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
+
+
 # airflow.contrib.*
 AWSAthenaHook()
 
@@ -48,6 +68,10 @@ AWSAthenaHook()
 DatasetAliasEvent()
 
 
+# airflow.hooks
+BaseHook()
+
+
 # airflow.operators.subdag.*
 SubDagOperator()
 
@@ -57,6 +81,10 @@ SubDagOperator()
 LocalFilesystemBackend()
 
 
+# airflow.sensors.base_sensor_operator
+BaseSensorOperator()
+
+
 # airflow.triggers.external_task
 TaskStateTrigger()
 
@@ -86,8 +114,15 @@ create_session
 apply_defaults
 
 # airflow.utils.file
+TemporaryDirectory()
 mkdirs
 
+#  airflow.utils.helpers
+helper_chain
+helper_cross_downstream
+
+#  airflow.utils.log
+secrets_masker
 
 # airflow.utils.state
 SHUTDOWN
@@ -100,8 +135,37 @@ TriggerRule.NONE_FAILED_OR_SKIPPED
 
 # airflow.www.auth
 has_access
-has_access_dataset
 
 # airflow.www.utils
 get_sensitive_variables_fields
 should_hide_value_for_key
+
+# airflow.operators.python
+from airflow.operators.python import get_current_context
+
+get_current_context()
+
+# airflow.providers.mysql
+from airflow.providers.mysql.datasets.mysql import sanitize_uri
+
+sanitize_uri
+
+# airflow.providers.postgres
+from airflow.providers.postgres.datasets.postgres import sanitize_uri
+
+sanitize_uri
+
+# airflow.providers.trino
+from airflow.providers.trino.datasets.trino import sanitize_uri
+
+sanitize_uri
+
+# airflow.notifications.basenotifier
+from airflow.notifications.basenotifier import BaseNotifier
+
+BaseNotifier()
+
+# airflow.auth.manager
+from airflow.auth.managers.base_auth_manager import BaseAuthManager
+
+BaseAuthManager()

crates/ruff_linter/resources/test/fixtures/airflow/AIR301_names_fix.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from airflow.api_connexion.security import requires_access_dataset
 from airflow.auth.managers.models.resource_details import (
     DatasetDetails,
+
 )
 from airflow.datasets.manager import (
     DatasetManager,
@@ -11,13 +12,15 @@ from airflow.datasets.manager import (
 )
 from airflow.lineage.hook import DatasetLineageInfo
 from airflow.metrics.validators import AllowListValidator, BlockListValidator
-from airflow.secrets.local_filesystem import load_connections
+from airflow.secrets.local_filesystm import load_connections
 from airflow.security.permissions import RESOURCE_DATASET
+from airflow.www.auth import has_access_dataset
 
 requires_access_dataset()
 
 DatasetDetails()
 
+
 DatasetManager()
 dataset_manager()
 resolve_dataset_manager()
@@ -31,6 +34,7 @@ load_connections()
 
 RESOURCE_DATASET
 
+has_access_dataset()
 
 from airflow.listeners.spec.dataset import (
     on_dataset_changed,
@@ -39,76 +43,3 @@ from airflow.listeners.spec.dataset import (
 
 on_dataset_created()
 on_dataset_changed()
-
-
-# airflow.operators.python
-from airflow.operators.python import get_current_context
-
-get_current_context()
-
-# airflow.providers.mysql
-from airflow.providers.mysql.datasets.mysql import sanitize_uri
-
-sanitize_uri
-
-# airflow.providers.postgres
-from airflow.providers.postgres.datasets.postgres import sanitize_uri
-
-sanitize_uri
-
-# airflow.providers.trino
-from airflow.providers.trino.datasets.trino import sanitize_uri
-
-sanitize_uri
-
-# airflow.notifications.basenotifier
-from airflow.notifications.basenotifier import BaseNotifier
-
-BaseNotifier()
-
-# airflow.auth.manager
-from airflow.auth.managers.base_auth_manager import BaseAuthManager
-
-BaseAuthManager()
-
-
-from airflow.configuration import (
-    as_dict,
-    get,
-    getboolean,
-    getfloat,
-    getint,
-    has_option,
-    remove_option,
-    set,
-)
-
-# airflow.configuration
-get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
-from airflow.hooks.base_hook import BaseHook
-
-# airflow.hooks
-BaseHook()
-
-from airflow.sensors.base_sensor_operator import BaseSensorOperator
-
-# airflow.sensors.base_sensor_operator
-BaseSensorOperator()
-BaseHook()
-
-from airflow.utils.helpers import chain as helper_chain
-from airflow.utils.helpers import cross_downstream as helper_cross_downstream
-
-#  airflow.utils.helpers
-helper_chain
-helper_cross_downstream
-
-# airflow.utils.file
-from airflow.utils.file import TemporaryDirectory
-
-TemporaryDirectory()
-
-from airflow.utils.log import secrets_masker
-
-#  airflow.utils.log
-secrets_masker

crates/ruff_linter/resources/test/fixtures/airflow/AIR301_provider_names_fix.py

@@ -1,54 +1,54 @@
 from __future__ import annotations
 
 from airflow.providers.amazon.aws.auth_manager.avp.entities import AvpEntities
-from airflow.providers.openlineage.utils.utils import (
-    DatasetInfo,
-    translate_airflow_dataset,
-)
-from airflow.secrets.local_filesystem import load_connections
-from airflow.security.permissions import RESOURCE_DATASET
-
-AvpEntities.DATASET
-
-# airflow.providers.openlineage.utils.utils
-DatasetInfo()
-translate_airflow_dataset()
-
-# airflow.secrets.local_filesystem
-load_connections()
-
-# airflow.security.permissions
-RESOURCE_DATASET
-
 from airflow.providers.amazon.aws.datasets.s3 import (
     convert_dataset_to_openlineage as s3_convert_dataset_to_openlineage,
 )
 from airflow.providers.amazon.aws.datasets.s3 import create_dataset as s3_create_dataset
-
-s3_create_dataset()
-s3_convert_dataset_to_openlineage()
-
 from airflow.providers.common.io.dataset.file import (
     convert_dataset_to_openlineage as io_convert_dataset_to_openlineage,
 )
 from airflow.providers.common.io.dataset.file import create_dataset as io_create_dataset
 
-io_create_dataset()
-io_convert_dataset_to_openlineage()
-
-
-# # airflow.providers.google.datasets.bigquery
 from airflow.providers.google.datasets.bigquery import (
     create_dataset as bigquery_create_dataset,
 )
-
-bigquery_create_dataset()
-
-# airflow.providers.google.datasets.gcs
 from airflow.providers.google.datasets.gcs import (
     convert_dataset_to_openlineage as gcs_convert_dataset_to_openlineage,
 )
 from airflow.providers.google.datasets.gcs import create_dataset as gcs_create_dataset
+from airflow.providers.openlineage.utils.utils import (
+    DatasetInfo,
+    translate_airflow_dataset,
+)
 
+AvpEntities.DATASET
+
+s3_create_dataset()
+s3_convert_dataset_to_openlineage()
+
+io_create_dataset()
+io_convert_dataset_to_openlineage()
+
+
+
+# airflow.providers.google.datasets.bigquery
+bigquery_create_dataset()
+# airflow.providers.google.datasets.gcs
 gcs_create_dataset()
 gcs_convert_dataset_to_openlineage()
+# airflow.providers.openlineage.utils.utils
+DatasetInfo()
+translate_airflow_dataset()
+#
+# airflow.secrets.local_filesystem
+load_connections()
+#
+# airflow.security.permissions
+RESOURCE_DATASET
+
+# airflow.timetables
+DatasetTriggeredTimetable()
+#
+# airflow.www.auth
+has_access_dataset

crates/ruff_linter/resources/test/fixtures/airflow/AIR302_amazon.py

@@ -5,30 +5,35 @@ from airflow.hooks.S3_hook import (
     provide_bucket_name,
 )
 from airflow.operators.gcs_to_s3 import GCSToS3Operator
-from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Operator
-from airflow.operators.redshift_to_s3_operator import RedshiftToS3Operator
+from airflow.operators.google_api_to_s3_transfer import (
+    GoogleApiToS3Operator,
+    GoogleApiToS3Transfer,
+)
+from airflow.operators.redshift_to_s3_operator import (
+    RedshiftToS3Operator,
+    RedshiftToS3Transfer,
+)
 from airflow.operators.s3_file_transform_operator import S3FileTransformOperator
-from airflow.operators.s3_to_redshift_operator import S3ToRedshiftOperator
+from airflow.operators.s3_to_redshift_operator import (
+    S3ToRedshiftOperator,
+    S3ToRedshiftTransfer,
+)
 from airflow.sensors.s3_key_sensor import S3KeySensor
 
 S3Hook()
 provide_bucket_name()
 
 GCSToS3Operator()
+
 GoogleApiToS3Operator()
-RedshiftToS3Operator()
-S3FileTransformOperator()
-S3ToRedshiftOperator()
-S3KeySensor()
-
-from airflow.operators.google_api_to_s3_transfer import GoogleApiToS3Transfer
-
 GoogleApiToS3Transfer()
 
-from airflow.operators.redshift_to_s3_operator import RedshiftToS3Transfer
-
+RedshiftToS3Operator()
 RedshiftToS3Transfer()
 
-from airflow.operators.s3_to_redshift_operator import S3ToRedshiftTransfer
+S3FileTransformOperator()
 
+S3ToRedshiftOperator()
 S3ToRedshiftTransfer()
+
+S3KeySensor()

crates/ruff_linter/resources/test/fixtures/airflow/AIR302_common_sql.py

@@ -4,13 +4,10 @@ from airflow.hooks.dbapi import (
     ConnectorProtocol,
     DbApiHook,
 )
-
-ConnectorProtocol()
-DbApiHook()
-
 from airflow.hooks.dbapi_hook import DbApiHook
 from airflow.operators.check_operator import SQLCheckOperator
 
+ConnectorProtocol()
 DbApiHook()
 SQLCheckOperator()
 

crates/ruff_linter/resources/test/fixtures/airflow/AIR302_hive.py

@@ -12,59 +12,55 @@ from airflow.macros.hive import (
 )
 from airflow.operators.hive_operator import HiveOperator
 from airflow.operators.hive_stats_operator import HiveStatsCollectionOperator
-from airflow.operators.hive_to_mysql import HiveToMySqlOperator
+from airflow.operators.hive_to_mysql import (
+    HiveToMySqlOperator,
+    HiveToMySqlTransfer,
+)
 from airflow.operators.hive_to_samba_operator import HiveToSambaOperator
-
-HIVE_QUEUE_PRIORITIES
-HiveCliHook()
-HiveMetastoreHook()
-HiveServer2Hook()
+from airflow.operators.mssql_to_hive import (
+    MsSqlToHiveOperator,
+    MsSqlToHiveTransfer,
+)
+from airflow.operators.mysql_to_hive import (
+    MySqlToHiveOperator,
+    MySqlToHiveTransfer,
+)
+from airflow.operators.s3_to_hive_operator import (
+    S3ToHiveOperator,
+    S3ToHiveTransfer,
+)
+from airflow.sensors.hive_partition_sensor import HivePartitionSensor
+from airflow.sensors.metastore_partition_sensor import MetastorePartitionSensor
+from airflow.sensors.named_hive_partition_sensor import NamedHivePartitionSensor
 
 closest_ds_partition()
 max_partition()
 
+HiveCliHook()
+HiveMetastoreHook()
+HiveServer2Hook()
+HIVE_QUEUE_PRIORITIES
+
 HiveOperator()
+
 HiveStatsCollectionOperator()
+
 HiveToMySqlOperator()
-HiveToSambaOperator()
-
-
-from airflow.operators.hive_to_mysql import HiveToMySqlTransfer
-
 HiveToMySqlTransfer()
 
-from airflow.operators.mysql_to_hive import MySqlToHiveOperator
-
-MySqlToHiveOperator()
-
-from airflow.operators.mysql_to_hive import MySqlToHiveTransfer
-
-MySqlToHiveTransfer()
-
-from airflow.operators.mssql_to_hive import MsSqlToHiveOperator
+HiveToSambaOperator()
 
 MsSqlToHiveOperator()
-
-from airflow.operators.mssql_to_hive import MsSqlToHiveTransfer
-
 MsSqlToHiveTransfer()
 
-from airflow.operators.s3_to_hive_operator import S3ToHiveOperator
+MySqlToHiveOperator()
+MySqlToHiveTransfer()
 
 S3ToHiveOperator()
-
-from airflow.operators.s3_to_hive_operator import S3ToHiveTransfer
-
 S3ToHiveTransfer()
 
-from airflow.sensors.hive_partition_sensor import HivePartitionSensor
-
 HivePartitionSensor()
 
-from airflow.sensors.metastore_partition_sensor import MetastorePartitionSensor
-
 MetastorePartitionSensor()
 
-from airflow.sensors.named_hive_partition_sensor import NamedHivePartitionSensor
-
 NamedHivePartitionSensor()

crates/ruff_linter/resources/test/fixtures/airflow/AIR302_kubernetes.py

@@ -16,7 +16,14 @@ from airflow.kubernetes.kube_client import (
 from airflow.kubernetes.kubernetes_helper_functions import (
     add_pod_suffix,
     annotations_for_logging_task_metadata,
+    annotations_to_key,
     create_pod_id,
+    get_logs_task_metadata,
+    rand_str,
+)
+from airflow.kubernetes.pod import (
+    Port,
+    Resources,
 )
 
 ALL_NAMESPACES
@@ -30,13 +37,21 @@ _enable_tcp_keepalive()
 get_kube_client()
 
 add_pod_suffix()
-annotations_for_logging_task_metadata()
 create_pod_id()
 
+annotations_for_logging_task_metadata()
+annotations_to_key()
+get_logs_task_metadata()
+rand_str()
+
+Port()
+Resources()
+
 
 from airflow.kubernetes.pod_generator import (
     PodDefaults,
     PodGenerator,
+    PodGeneratorDeprecated,
     add_pod_suffix,
     datetime_to_label_safe_datestring,
     extend_object_field,
@@ -46,16 +61,18 @@ from airflow.kubernetes.pod_generator import (
     rand_str,
 )
 
-PodDefaults()
-PodGenerator()
-add_pod_suffix()
 datetime_to_label_safe_datestring()
 extend_object_field()
 label_safe_datestring_to_datetime()
 make_safe_label_value()
 merge_objects()
+PodGenerator()
+PodDefaults()
+PodGeneratorDeprecated()
+add_pod_suffix()
 rand_str()
 
+
 from airflow.kubernetes.pod_generator_deprecated import (
     PodDefaults,
     PodGenerator,
@@ -73,6 +90,7 @@ make_safe_label_value()
 PodLauncher()
 PodStatus()
 
+
 from airflow.kubernetes.pod_launcher_deprecated import (
     PodDefaults,
     PodLauncher,
@@ -97,17 +115,3 @@ K8SModel()
 Secret()
 Volume()
 VolumeMount()
-
-from airflow.kubernetes.kubernetes_helper_functions import (
-    annotations_to_key,
-    get_logs_task_metadata,
-    rand_str,
-)
-
-annotations_to_key()
-get_logs_task_metadata()
-rand_str()
-
-from airflow.kubernetes.pod_generator import PodGeneratorDeprecated
-
-PodGeneratorDeprecated()

crates/ruff_linter/resources/test/fixtures/airflow/AIR302_standard.py

@@ -5,6 +5,10 @@ from airflow.operators.dagrun_operator import (
     TriggerDagRunLink,
     TriggerDagRunOperator,
 )
+from airflow.operators.dummy import (
+    DummyOperator,
+    EmptyOperator,
+)
 from airflow.operators.latest_only_operator import LatestOnlyOperator
 from airflow.operators.python_operator import (
     BranchPythonOperator,
@@ -15,12 +19,15 @@ from airflow.operators.python_operator import (
 from airflow.sensors.external_task_sensor import (
     ExternalTaskMarker,
     ExternalTaskSensor,
+    ExternalTaskSensorLink,
 )
 
 BashOperator()
 
 TriggerDagRunLink()
 TriggerDagRunOperator()
+DummyOperator()
+EmptyOperator()
 
 LatestOnlyOperator()
 
@@ -31,48 +38,25 @@ ShortCircuitOperator()
 
 ExternalTaskMarker()
 ExternalTaskSensor()
+ExternalTaskSensorLink()
 
+from airflow.operators.dummy_operator import (
+    DummyOperator,
+    EmptyOperator,
+)
+
+DummyOperator()
+EmptyOperator()
 
 from airflow.hooks.subprocess import SubprocessResult
-
 SubprocessResult()
-
 from airflow.hooks.subprocess import working_directory
-
 working_directory()
-
 from airflow.operators.datetime import target_times_as_dates
-
 target_times_as_dates()
-
 from airflow.operators.trigger_dagrun import TriggerDagRunLink
-
 TriggerDagRunLink()
-
 from airflow.sensors.external_task import ExternalTaskSensorLink
-
 ExternalTaskSensorLink()
-
 from airflow.sensors.time_delta import WaitSensor
-
-WaitSensor()
-
-from airflow.operators.dummy import DummyOperator
-
-DummyOperator()
-
-from airflow.operators.dummy import EmptyOperator
-
-EmptyOperator()
-
-from airflow.operators.dummy_operator import DummyOperator
-
-DummyOperator()
-
-from airflow.operators.dummy_operator import EmptyOperator
-
-EmptyOperator()
-
-from airflow.sensors.external_task_sensor import ExternalTaskSensorLink
-
-ExternalTaskSensorLink()
+WaitSensor()

crates/ruff_linter/resources/test/fixtures/airflow/AIR311_names.py

@@ -9,12 +9,19 @@ from airflow.datasets import (
     expand_alias_to_datasets,
 )
 from airflow.datasets.metadata import Metadata
-from airflow.decorators import (
-    dag,
-    setup,
-    task,
-    task_group,
+from airflow.decorators import dag, setup, task, task_group, teardown
+from airflow.io.path import ObjectStoragePath
+from airflow.io.storage import attach
+from airflow.models import DAG as DAGFromModel
+from airflow.models import (
+    Connection,
+    Variable,
 )
+from airflow.models.baseoperator import chain, chain_linear, cross_downstream
+from airflow.models.baseoperatorlink import BaseOperatorLink
+from airflow.models.dag import DAG as DAGFromDag
+from airflow.timetables.datasets import DatasetOrTimeSchedule
+from airflow.utils.dag_parsing_context import get_parsing_context
 
 # airflow
 DatasetFromRoot()
@@ -32,22 +39,9 @@ dag()
 task()
 task_group()
 setup()
-from airflow.decorators import teardown
-from airflow.io.path import ObjectStoragePath
-from airflow.io.storage import attach
-from airflow.models import DAG as DAGFromModel
-from airflow.models import (
-    Connection,
-    Variable,
-)
-from airflow.models.baseoperator import chain, chain_linear, cross_downstream
-from airflow.models.baseoperatorlink import BaseOperatorLink
-from airflow.models.dag import DAG as DAGFromDag
-
-# airflow.decorators
 teardown()
 
-# # airflow.io
+# airflow.io
 ObjectStoragePath()
 attach()
 
@@ -66,9 +60,6 @@ BaseOperatorLink()
 
 # airflow.models.dag
 DAGFromDag()
-from airflow.timetables.datasets import DatasetOrTimeSchedule
-from airflow.utils.dag_parsing_context import get_parsing_context
-
 # airflow.timetables.datasets
 DatasetOrTimeSchedule()
 

crates/ruff_linter/resources/test/fixtures/airflow/AIR312.py

@@ -7,71 +7,49 @@ from airflow.operators.bash import BashOperator
 from airflow.operators.datetime import BranchDateTimeOperator
 from airflow.operators.empty import EmptyOperator
 from airflow.operators.latest_only import LatestOnlyOperator
-from airflow.operators.trigger_dagrun import TriggerDagRunOperator
-from airflow.operators.weekday import BranchDayOfWeekOperator
-from airflow.sensors.date_time import DateTimeSensor
-
-FSHook()
-PackageIndexHook()
-SubprocessHook()
-
-BashOperator()
-BranchDateTimeOperator()
-TriggerDagRunOperator()
-EmptyOperator()
-
-LatestOnlyOperator()
-BranchDayOfWeekOperator()
-DateTimeSensor()
-
 from airflow.operators.python import (
     BranchPythonOperator,
     PythonOperator,
     PythonVirtualenvOperator,
     ShortCircuitOperator,
 )
-from airflow.sensors.date_time import DateTimeSensorAsync
+from airflow.operators.trigger_dagrun import TriggerDagRunOperator
+from airflow.operators.weekday import BranchDayOfWeekOperator
+from airflow.sensors.date_time import DateTimeSensor, DateTimeSensorAsync
 from airflow.sensors.external_task import (
     ExternalTaskMarker,
     ExternalTaskSensor,
-)
-from airflow.sensors.time_sensor import (
-    TimeSensor,
-    TimeSensorAsync,
+
 )
 from airflow.sensors.filesystem import FileSensor
-
-BranchPythonOperator()
-PythonOperator()
-PythonVirtualenvOperator()
-ShortCircuitOperator()
-DateTimeSensorAsync()
-ExternalTaskMarker()
-ExternalTaskSensor()
-FileSensor()
-TimeSensor()
-TimeSensorAsync()
-
-from airflow.sensors.time_delta import (
-    TimeDeltaSensor,
-    TimeDeltaSensorAsync,
-)
+from airflow.sensors.time_delta import TimeDeltaSensor, TimeDeltaSensorAsync
+from airflow.sensors.time_sensor import TimeSensor, TimeSensorAsync
 from airflow.sensors.weekday import DayOfWeekSensor
-from airflow.triggers.external_task import (
-    DagStateTrigger,
-    WorkflowTrigger,
-)
+from airflow.triggers.external_task import DagStateTrigger, WorkflowTrigger
 from airflow.triggers.file import FileTrigger
-from airflow.triggers.temporal import (
-    DateTimeTrigger,
-    TimeDeltaTrigger,
-)
+from airflow.triggers.temporal import DateTimeTrigger, TimeDeltaTrigger
 
-TimeDeltaSensor()
-TimeDeltaSensorAsync()
+FSHook()
+PackageIndexHook()
+SubprocessHook()
+BashOperator()
+BranchDateTimeOperator()
+TriggerDagRunOperator()
+EmptyOperator()
+LatestOnlyOperator()
+(
+    BranchPythonOperator(),
+    PythonOperator(),
+    PythonVirtualenvOperator(),
+    ShortCircuitOperator(),
+)
+BranchDayOfWeekOperator()
+DateTimeSensor(), DateTimeSensorAsync()
+ExternalTaskMarker(), ExternalTaskSensor()
+FileSensor()
+TimeSensor(), TimeSensorAsync()
+TimeDeltaSensor(), TimeDeltaSensorAsync()
 DayOfWeekSensor()
-DagStateTrigger()
-WorkflowTrigger()
+DagStateTrigger(), WorkflowTrigger()
 FileTrigger()
-DateTimeTrigger()
-TimeDeltaTrigger()
+DateTimeTrigger(), TimeDeltaTrigger()

crates/ruff_linter/resources/test/fixtures/fastapi/FAST003.py

@@ -178,38 +178,3 @@ async def unknown_1(other: str = Depends(unknown_unresolved)): ...
 async def unknown_2(other: str = Depends(unknown_not_function)): ...
 @app.get("/things/{thing_id}")
 async def unknown_3(other: str = Depends(unknown_imported)): ...
-
-
-# Class dependencies
-from pydantic import BaseModel
-from dataclasses import dataclass
-
-class PydanticParams(BaseModel):
-    my_id: int
-
-
-class InitParams:
-    def __init__(self, my_id: int):
-        self.my_id = my_id
-
-
-# Errors
-@app.get("/{id}")
-async def get_id_pydantic_full(
-    params: Annotated[PydanticParams, Depends(PydanticParams)],
-): ...
-@app.get("/{id}")
-async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ...
-@app.get("/{id}")
-async def get_id_init_not_annotated(params = Depends(InitParams)): ...
-
-
-# No errors
-@app.get("/{my_id}")
-async def get_id_pydantic_full(
-    params: Annotated[PydanticParams, Depends(PydanticParams)],
-): ...
-@app.get("/{my_id}")
-async def get_id_pydantic_short(params: Annotated[PydanticParams, Depends()]): ...
-@app.get("/{my_id}")
-async def get_id_init_not_annotated(params = Depends(InitParams)): ...

crates/ruff_linter/resources/test/fixtures/flake8_bandit/S104.py

@@ -22,8 +22,3 @@ def my_func():
 
 # Implicit string concatenation
 "0.0.0.0" f"0.0.0.0{expr}0.0.0.0"
-
-# t-strings - all ok
-t"0.0.0.0"
-"0.0.0.0" t"0.0.0.0{expr}0.0.0.0"
-"0.0.0.0" f"0.0.0.0{expr}0.0.0.0" t"0.0.0.0{expr}0.0.0.0"

crates/ruff_linter/resources/test/fixtures/flake8_bandit/S108.py

@@ -40,7 +40,3 @@ with tempfile.TemporaryDirectory(dir="/dev/shm") as d:
 
 with TemporaryDirectory(dir="/tmp") as d:
     pass
-
-# ok (runtime error from t-string)
-with open(t"/foo/bar", "w") as f:
-    f.write("def")

crates/ruff_linter/resources/test/fixtures/flake8_bandit/S608.py

@@ -169,13 +169,3 @@ query60 = f"""
 
 # https://github.com/astral-sh/ruff/issues/17967
 query61 = f"SELECT * FROM table" # skip expressionless f-strings
-
-# t-strings
-query62 = t"SELECT * FROM table"
-query63 = t"""
-    SELECT *,
-        foo
-    FROM ({user_input}) raw
-"""
-query64 = f"update {t"{table}"} set var = {t"{var}"}"
-query65 = t"update {f"{table}"} set var = {f"{var}"}"

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

@@ -67,6 +67,3 @@ getattr(self.
 
 import builtins
 builtins.getattr(foo, "bar")
-
-# Regression test for: https://github.com/astral-sh/ruff/issues/18353
-setattr(foo, "__debug__", 0)

crates/ruff_linter/resources/test/fixtures/flake8_bugbear/B909.py

@@ -179,17 +179,3 @@ def func():
     for elem in some_list:
         if some_list.pop() == 2:
             return
-
-# should not error - direct return with mutation (Issue #18399)
-def fail_map(mapping):
-    for key in mapping:
-        return mapping.pop(key)
-
-def success_map(mapping):
-    for key in mapping:
-        ret = mapping.pop(key)  # should not error
-        return ret
-
-def fail_list(seq):
-    for val in seq:
-        return seq.pop(4)

crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC.py

@@ -91,99 +91,3 @@ _ = "\8""0" # fix should be "\80"
 _ = "\12""8" # fix should be "\128"
 _ = "\12""foo" # fix should be "\12foo"
 _ = "\12" ""  # fix should be "\12"
-
-
-# Mixed literal + non-literal scenarios
-_ = (
-    "start" +
-    variable +
-    "end"
-)
-
-_ = (
-    f"format" +
-    func_call() +
-    "literal"
-)
-
-_ = (
-    rf"raw_f{x}" +
-    r"raw_normal"
-)
-
-
-# Different prefix combinations
-_ = (
-    u"unicode" +
-    r"raw"
-)
-
-_ = (
-    rb"raw_bytes" +
-    b"normal_bytes"
-)
-
-_ = (
-    b"bytes" +
-    b"with_bytes"
-)
-
-# Repeated concatenation
-
-_ = ("a" +
-    "b" +
-    "c" +
-    "d" + "e"
-)
-
-_ = ("a"
-    + "b"
-    + "c"
-    + "d"
-    + "e"
-)
-
-_ = (
-    "start" +
-    variable + # comment
-    "end"
-)
-
-_ = (
-    "start" +
-    variable
-		# leading comment
-    + "end"
-)
-
-_ = (
-    "first"
-    +    "second"  # extra spaces around +
-)
-
-_ = (
-    "first"    +  # trailing spaces before +
-    "second"
-)
-
-_ = ((
-    "deep" +
-    "nesting"
-))
-
-_ = (
-    "contains + plus" +
-    "another string"
-)
-
-_ = (
-    "start"
-		# leading comment
-    + "end"
-)
-
-_ = (
-    "start" +
-		# leading comment
-    "end"
-)

crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI019_0.py

@@ -181,34 +181,3 @@ MetaType = TypeVar("MetaType")
 class MetaTestClass(type):
     def m(cls: MetaType) -> MetaType:
         return cls
-
-
-from __future__ import annotations
-
-class BadClassWithStringTypeHints:
-    def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019
-
-    @classmethod
-    def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019
-
-
-    @classmethod
-    def bad_class_method_with_mixed_annotations_1(cls: "type[_S]") -> _S: ... # PYI019
-
-
-    @classmethod
-    def bad_class_method_with_mixed_annotations_1(cls: type[_S]) -> "_S": ... # PYI019
-
-
-class BadSubscriptReturnTypeWithStringTypeHints:
-    @classmethod
-    def m[S](cls: "type[S]") -> "type[S]": ...  # PYI019
-
-
-class GoodClassWiStringTypeHints:
-    @classmethod
-    def good_cls_method_with_mixed_annotations(cls: "type[Self]", arg: str) -> Self: ...
-    @staticmethod
-    def good_static_method_with_string_annotations(arg: "_S") -> "_S": ...
-    @classmethod
-    def good_class_method_with_args_string_annotations(cls, arg1: "_S", arg2: "_S") -> "_S": ...

crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI019_0.pyi

@@ -172,36 +172,3 @@ MetaType = TypeVar("MetaType")
 class MetaTestClass(type):
     def m(cls: MetaType) -> MetaType:
         return cls
-
-
-from __future__ import annotations
-
-
-class BadClassWithStringTypeHints:
-    def bad_instance_method_with_string_annotations(self: "_S", arg: str) -> "_S": ... # PYI019
-
-    @classmethod
-    def bad_class_method_with_string_annotations(cls: "type[_S]") -> "_S": ... # PYI019
-
-
-    @classmethod
-    def bad_class_method_with_mixed_annotations_1(cls: "type[_S]") -> _S: ... # PYI019
-
-
-    @classmethod
-    def bad_class_method_with_mixed_annotations_1(cls: type[_S]) -> "_S": ... # PYI019
-
-
-class BadSubscriptReturnTypeWithStringTypeHints:
-    @classmethod
-    def m[S](cls: "type[S]") -> "type[S]": ...  # PYI019
-
-
-class GoodClassWithStringTypeHints:
-    @classmethod
-    def good_cls_method_with_mixed_annotations(cls: "type[Self]", arg: str) -> Self: ...
-    @staticmethod
-    def good_static_method_with_string_annotations(arg: "_S") -> "_S": ...
-    @classmethod
-    def good_class_method_with_args_string_annotations(cls, arg1: "_S", arg2: "_S") -> "_S": ...
-

crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI053.py

@@ -72,5 +72,3 @@ def not_warnings_dot_deprecated(
 
 @not_warnings_dot_deprecated("Not warnings.deprecated, so this one *should* lead to PYI053 in a stub!")
 def not_a_deprecated_function() -> None: ...
-
-baz: str = t"51 character stringgggggggggggggggggggggggggggggggg"

crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI053.pyi

@@ -80,7 +80,3 @@ x: TypeAlias = Literal["fooooooooooooooooooooooooooooooooooooooooooooooooooooooo
 
 # Ok
 y: TypeAlias = Annotated[int, "metadataaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
-
-ttoo: str = t"50 character stringggggggggggggggggggggggggggggggg"  # OK
-
-tbar: str = t"51 character stringgggggggggggggggggggggggggggggggg"  # Error: PYI053

crates/ruff_linter/resources/test/fixtures/flake8_pyi/PYI059.py

@@ -52,15 +52,3 @@ class MyList(Sized, Generic[T]):  # Generic already in last place
 
 class SomeGeneric(Generic[T]):  # Only one generic
     pass
-
-
-# syntax errors with starred and keyword arguments from
-# https://github.com/astral-sh/ruff/issues/18602
-class C1(Generic[T], str, **{"metaclass": type}):  # PYI059
-    ...
-
-class C2(Generic[T], str, metaclass=type):  # PYI059
-    ...
-
-class C3(Generic[T], metaclass=type, *[str]):  # PYI059 but no fix
-    ...

crates/ruff_linter/resources/test/fixtures/flake8_quotes/doubles_escaped.py

@@ -39,27 +39,3 @@ f'\'normal\' {f'nested'} normal'  # Q003
 f'\'normal\' {f'nested'} "double quotes"'
 f'\'normal\' {f'\'nested\' {'other'} normal'} "double quotes"'  # Q003
 f'\'normal\' {f'\'nested\' {'other'} "double quotes"'} normal'  # Q00l
-
-
-
-# Same as above, but with t-strings
-t'This is a \'string\''  # Q003
-t'This is \\ a \\\'string\''  # Q003
-t'"This" is a \'string\''
-f"This is a 'string'"
-f"\"This\" is a 'string'"
-fr'This is a \'string\''
-fR'This is a \'string\''
-foo = (
-    t'This is a'
-    t'\'string\''  # Q003
-)
-t'\'foo\' {'nested'}'  # Q003
-t'\'foo\' {t'nested'}'  # Q003
-t'\'foo\' {t'\'nested\''} \'\''  # Q003
-
-t'normal {t'nested'} normal'
-t'\'normal\' {t'nested'} normal'  # Q003
-t'\'normal\' {t'nested'} "double quotes"'
-t'\'normal\' {t'\'nested\' {'other'} normal'} "double quotes"'  # Q003
-t'\'normal\' {t'\'nested\' {'other'} "double quotes"'} normal'  # Q00l

crates/ruff_linter/resources/test/fixtures/flake8_quotes/singles_escaped.py

@@ -37,25 +37,3 @@ f"\"normal\" {f"nested"} normal"  # Q003
 f"\"normal\" {f"nested"} 'single quotes'"
 f"\"normal\" {f"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
 f"\"normal\" {f"\"nested\" {"other"} 'single quotes'"} normal"  # Q003
-
-
-# Same as above, but with t-strings
-t"This is a \"string\""
-t"'This' is a \"string\""
-f'This is a "string"'
-f'\'This\' is a "string"'
-fr"This is a \"string\""
-fR"This is a \"string\""
-foo = (
-    t"This is a"
-    t"\"string\""
-)
-t"\"foo\" {"foo"}"  # Q003
-t"\"foo\" {t"foo"}"  # Q003
-t"\"foo\" {t"\"foo\""} \"\""  # Q003
-
-t"normal {t"nested"} normal"
-t"\"normal\" {t"nested"} normal"  # Q003
-t"\"normal\" {t"nested"} 'single quotes'"
-t"\"normal\" {t"\"nested\" {"other"} normal"} 'single quotes'"  # Q003
-t"\"normal\" {t"\"nested\" {"other"} 'single quotes'"} normal"  # Q003

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

@@ -421,14 +421,3 @@ def func(a: dict[str, int]) -> list[dict[str, int]]:
     if "services" in a:
         services = a["services"]
         return services
-
-# See: https://github.com/astral-sh/ruff/issues/18411
-def f():
-    (#=
-    x) = 1
-    return x
-
-def f():
-    x = (1
-              )
-    return x

crates/ruff_linter/resources/test/fixtures/flake8_use_pathlib/PTH211.py

@@ -1,15 +0,0 @@
-import os
-from pathlib import Path
-
-
-os.symlink("usr/bin/python", "tmp/python")
-os.symlink(b"usr/bin/python", b"tmp/python")
-Path("tmp/python").symlink_to("usr/bin/python")  # Ok
-
-os.symlink("usr/bin/python", "tmp/python", target_is_directory=True)
-os.symlink(b"usr/bin/python", b"tmp/python", target_is_directory=True)
-Path("tmp/python").symlink_to("usr/bin/python", target_is_directory=True)  # Ok
-
-fd = os.open(".", os.O_RDONLY)
-os.symlink("source.txt", "link.txt", dir_fd=fd)  # Ok: dir_fd is not supported by pathlib
-os.close(fd)

crates/ruff_linter/resources/test/fixtures/pep8_naming/N804.py

@@ -81,9 +81,3 @@ foo = {}
 class Bar(type(foo)):
     def foo_method(self):
         pass
-
-# https://github.com/astral-sh/ruff/issues/18459
-class Example:
-    @classmethod
-    def function(this):
-        cls = 1234

crates/ruff_linter/resources/test/fixtures/pep8_naming/N805.py

@@ -134,9 +134,3 @@ class MyMeta(type):
 
 class MyProtocolMeta(type(Protocol)):
     def __subclasscheck__(cls, other): ...
-
-
-# https://github.com/astral-sh/ruff/issues/18459
-class C:
-    def f(this):
-        self = 123

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

@@ -266,15 +266,3 @@ def f():
     result = list()  # this should be replaced with a comprehension
     for i in values:
         result.append(i + 1)  # PERF401
-
-def f():
-    src = [1]
-    dst = []
-
-    for i in src:
-        if True if True else False:
-            dst.append(i)
-
-    for i in src:
-        if lambda: 0:
-            dst.append(i)

crates/ruff_linter/resources/test/fixtures/perflint/PERF403.py

@@ -151,16 +151,3 @@ def foo():
     result = {}
     for idx, name in indices, fruit:
         result[name] = idx  # PERF403
-
-
-def foo():
-    src = (("x", 1),)
-    dst = {}
-
-    for k, v in src:
-        if True if True else False:
-            dst[k] = v
-
-    for k, v in src:
-        if lambda: 0:
-            dst[k] = v

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

@@ -176,17 +176,4 @@ x = lambda: (
 x = lambda: (
     # comment
     y := 10
-)
-
-# https://github.com/astral-sh/ruff/issues/18475
-foo_tooltip = (
-    lambda x, data: f"\nfoo: {data['foo'][int(x)]}"
-    if data["foo"] is not None
-    else ""
-)
-
-foo_tooltip = (
-    lambda x, data: f"\nfoo: {data['foo'][int(x)]}" +
-    more
-
-)
+)

crates/ruff_linter/resources/test/fixtures/pycodestyle/W605_1.py

@@ -1,4 +1,4 @@
-# Same as `W605_0.py` but using f-strings and t-strings instead.
+# Same as `W605_0.py` but using f-strings instead.
 
 #: W605:1:10
 regex = f'\.png$'
@@ -66,72 +66,3 @@ s = f"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n"
 
 # Debug text (should trigger)
 t = f"{'\InHere'=}"
-
-
-
-#: W605:1:10
-regex = t'\.png$'
-
-#: W605:2:1
-regex = t'''
-\.png$
-'''
-
-#: W605:2:6
-f(
-    t'\_'
-)
-
-#: W605:4:6
-t"""
-multi-line
-literal
-with \_ somewhere
-in the middle
-"""
-
-#: W605:1:38
-value = t'new line\nand invalid escape \_ here'
-
-
-#: Okay
-regex = fr'\.png$'
-regex = t'\\.png$'
-regex = fr'''
-\.png$
-'''
-regex = fr'''
-\\.png$
-'''
-s = t'\\'
-regex = t'\w'  # noqa
-regex = t'''
-\w
-'''  # noqa
-
-regex = t'\\\_'
-value = t'\{{1}}'
-value = t'\{1}'
-value = t'{1:\}'
-value = t"{t"\{1}"}"
-value = rt"{t"\{1}"}"
-
-# Okay
-value = rt'\{{1}}'
-value = rt'\{1}'
-value = rt'{1:\}'
-value = t"{rt"\{1}"}"
-
-# Regression tests for https://github.com/astral-sh/ruff/issues/10434
-t"{{}}+-\d"
-t"\n{{}}+-\d+"
-t"\n{{}}<7D>+-\d+"
-
-# See https://github.com/astral-sh/ruff/issues/11491
-total = 10
-ok = 7
-incomplete = 3
-s = t"TOTAL: {total}\nOK: {ok}\INCOMPLETE: {incomplete}\n"
-
-# Debug text (should trigger)
-t = t"{'\InHere'=}"

crates/ruff_linter/resources/test/fixtures/pylint/missing_maxsplit_arg.py

@@ -1,184 +0,0 @@
-SEQ = "1,2,3"
-
-class Foo(str):
-    class_str = "1,2,3"
-    
-    def split(self, sep=None, maxsplit=-1) -> list[str]:
-        return super().split(sep, maxsplit)
-
-class Bar():
-    split = "1,2,3"
-
-# Errors
-## Test split called directly on string literal
-"1,2,3".split(",")[0]  # [missing-maxsplit-arg]
-"1,2,3".split(",")[-1]  # [missing-maxsplit-arg]
-"1,2,3".rsplit(",")[0]  # [missing-maxsplit-arg]
-"1,2,3".rsplit(",")[-1]  # [missing-maxsplit-arg]
-
-## Test split called on string variable
-SEQ.split(",")[0]  # [missing-maxsplit-arg]
-SEQ.split(",")[-1]  # [missing-maxsplit-arg]
-SEQ.rsplit(",")[0]  # [missing-maxsplit-arg]
-SEQ.rsplit(",")[-1]  # [missing-maxsplit-arg]
-
-## Test split called on class attribute
-Foo.class_str.split(",")[0]  # [missing-maxsplit-arg]
-Foo.class_str.split(",")[-1]  # [missing-maxsplit-arg]
-Foo.class_str.rsplit(",")[0]  # [missing-maxsplit-arg]
-Foo.class_str.rsplit(",")[-1]  # [missing-maxsplit-arg]
-
-## Test split called on sliced string
-"1,2,3"[::-1].split(",")[0]  # [missing-maxsplit-arg]
-"1,2,3"[::-1][::-1].split(",")[0]  # [missing-maxsplit-arg]
-SEQ[:3].split(",")[0]  # [missing-maxsplit-arg]
-Foo.class_str[1:3].split(",")[-1]  # [missing-maxsplit-arg]
-"1,2,3"[::-1].rsplit(",")[0]  # [missing-maxsplit-arg]
-SEQ[:3].rsplit(",")[0]  # [missing-maxsplit-arg]
-Foo.class_str[1:3].rsplit(",")[-1]  # [missing-maxsplit-arg]
-
-## Test sep given as named argument
-"1,2,3".split(sep=",")[0]  # [missing-maxsplit-arg]
-"1,2,3".split(sep=",")[-1]  # [missing-maxsplit-arg]
-"1,2,3".rsplit(sep=",")[0]  # [missing-maxsplit-arg]
-"1,2,3".rsplit(sep=",")[-1]  # [missing-maxsplit-arg]
-
-## Special cases
-"1,2,3".split("\n")[0]  # [missing-maxsplit-arg]
-"1,2,3".split("split")[-1]  # [missing-maxsplit-arg]
-"1,2,3".rsplit("rsplit")[0]  # [missing-maxsplit-arg]
-
-## Test class attribute named split
-Bar.split.split(",")[0]  # [missing-maxsplit-arg]
-Bar.split.split(",")[-1]  # [missing-maxsplit-arg]
-Bar.split.rsplit(",")[0]  # [missing-maxsplit-arg]
-Bar.split.rsplit(",")[-1]  # [missing-maxsplit-arg]
-
-## Test unpacked dict literal kwargs 
-"1,2,3".split(**{"sep": ","})[0]  # [missing-maxsplit-arg]
-
-
-# OK
-## Test not accessing the first or last element
-### Test split called directly on string literal
-"1,2,3".split(",")[1]
-"1,2,3".split(",")[-2]
-"1,2,3".rsplit(",")[1]
-"1,2,3".rsplit(",")[-2]
-
-### Test split called on string variable
-SEQ.split(",")[1]
-SEQ.split(",")[-2]
-SEQ.rsplit(",")[1]
-SEQ.rsplit(",")[-2]
-
-### Test split called on class attribute
-Foo.class_str.split(",")[1]
-Foo.class_str.split(",")[-2]
-Foo.class_str.rsplit(",")[1]
-Foo.class_str.rsplit(",")[-2]
-
-### Test split called on sliced string
-"1,2,3"[::-1].split(",")[1]
-SEQ[:3].split(",")[1]
-Foo.class_str[1:3].split(",")[-2]
-"1,2,3"[::-1].rsplit(",")[1]
-SEQ[:3].rsplit(",")[1]
-Foo.class_str[1:3].rsplit(",")[-2]
-
-### Test sep given as named argument
-"1,2,3".split(sep=",")[1]
-"1,2,3".split(sep=",")[-2]
-"1,2,3".rsplit(sep=",")[1]
-"1,2,3".rsplit(sep=",")[-2]
-
-## Test varying maxsplit argument
-### str.split() tests
-"1,2,3".split(sep=",", maxsplit=1)[-1]
-"1,2,3".split(sep=",", maxsplit=1)[0]
-"1,2,3".split(sep=",", maxsplit=2)[-1]
-"1,2,3".split(sep=",", maxsplit=2)[0]
-"1,2,3".split(sep=",", maxsplit=2)[1]
-
-### str.rsplit() tests
-"1,2,3".rsplit(sep=",", maxsplit=1)[-1]
-"1,2,3".rsplit(sep=",", maxsplit=1)[0]
-"1,2,3".rsplit(sep=",", maxsplit=2)[-1]
-"1,2,3".rsplit(sep=",", maxsplit=2)[0]
-"1,2,3".rsplit(sep=",", maxsplit=2)[1]
-
-## Test user-defined split
-Foo("1,2,3").split(",")[0]
-Foo("1,2,3").split(",")[-1]
-Foo("1,2,3").rsplit(",")[0]
-Foo("1,2,3").rsplit(",")[-1]
-
-## Test split called on sliced list
-["1", "2", "3"][::-1].split(",")[0]
-
-## Test class attribute named split
-Bar.split[0]
-Bar.split[-1]
-Bar.split[0]
-Bar.split[-1]
-
-## Test unpacked dict literal kwargs 
-"1,2,3".split(",", **{"maxsplit": 1})[0]
-"1,2,3".split(**{"sep": ",", "maxsplit": 1})[0]
-
-
-# TODO
-
-## Test variable split result index
-## TODO: These require the ability to resolve a variable name to a value
-# Errors
-result_index = 0
-"1,2,3".split(",")[result_index]  # TODO: [missing-maxsplit-arg]
-result_index = -1
-"1,2,3".split(",")[result_index]  # TODO: [missing-maxsplit-arg]
-# OK 
-result_index = 1
-"1,2,3".split(",")[result_index]
-result_index = -2
-"1,2,3".split(",")[result_index]
-
-
-## Test split result index modified in loop
-## TODO: These require the ability to recognize being in a loop where:
-##     - the result of split called on a string is indexed by a variable
-##     - the variable index above is modified
-# OK
-result_index = 0
-for j in range(3):
-    print(SEQ.split(",")[result_index])
-    result_index = result_index + 1
-
-
-## Test accessor
-## TODO: These require the ability to get the return type of a method
-## (possibly via `typing::is_string`)
-class Baz():
-    def __init__(self):
-        self.my_str = "1,2,3"
-
-    def get_string(self) -> str:
-        return self.my_str
-
-# Errors
-Baz().get_string().split(",")[0]  # TODO: [missing-maxsplit-arg]
-Baz().get_string().split(",")[-1]  # TODO: [missing-maxsplit-arg]
-# OK
-Baz().get_string().split(",")[1]
-Baz().get_string().split(",")[-2]
-
-
-## Test unpacked dict instance kwargs
-## TODO: These require the ability to resolve a dict variable name to a value
-# Errors
-kwargs_without_maxsplit = {"seq": ","}
-"1,2,3".split(**kwargs_without_maxsplit)[0]  # TODO: [missing-maxsplit-arg]
-# OK
-kwargs_with_maxsplit = {"maxsplit": 1}
-"1,2,3".split(",", **kwargs_with_maxsplit)[0]  # TODO: false positive
-kwargs_with_maxsplit = {"sep": ",", "maxsplit": 1}
-"1,2,3".split(**kwargs_with_maxsplit)[0]  # TODO: false positive

crates/ruff_linter/resources/test/fixtures/pylint/redeclared_assigned_name.py

@@ -2,8 +2,5 @@ FIRST, FIRST = (1, 2)  # PLW0128
 FIRST, (FIRST, SECOND) = (1, (1, 2))  # PLW0128
 FIRST, (FIRST, SECOND, (THIRD, FIRST)) = (1, (1, 2))  # PLW0128
 FIRST, SECOND, THIRD, FIRST, SECOND = (1, 2, 3, 4)  # PLW0128
-FIRST, [FIRST, SECOND] = (1, (1, 2)) # PLW0128
-FIRST, [FIRST, SECOND, [THIRD, FIRST]] = (1, (1, 2))  # PLW0128
-FIRST, *FIRST = (1, 2) # PLW0128
 
 FIRST, SECOND, _, _, _ignored = (1, 2, 3, 4, 5)  # OK

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP008.py

@@ -79,29 +79,3 @@ class DataClass:
 def normal(self):
     super(DataClass, self).f()  # OK
     super().f()  # OK (`TypeError` in practice)
-
-
-# see: https://github.com/astral-sh/ruff/issues/18477
-class A:
-    def foo(self):
-        pass
-
-
-class B(A):
-    def bar(self):
-        super(__class__, self).foo()
-
-
-# see: https://github.com/astral-sh/ruff/issues/18684
-class C:
-    def f(self):
-        super = print
-        super(C, self)
-
-
-import builtins
-
-
-class C:
-    def f(self):
-        builtins.super(C, self)

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP035.py

@@ -110,8 +110,6 @@ from typing_extensions import CapsuleType
 # UP035 on py313+ only
 from typing_extensions import deprecated
 
-# UP035 on py313+ only
-from typing_extensions import get_type_hints
 
 # https://github.com/astral-sh/ruff/issues/15780
 from typing_extensions import is_typeddict

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP045.py

@@ -42,8 +42,3 @@ class ServiceRefOrValue:
 # Regression test for: https://github.com/astral-sh/ruff/issues/7201
 class ServiceRefOrValue:
     service_specification: Optional[str]is not True = None
-
-
-# Test for: https://github.com/astral-sh/ruff/issues/18508
-# Optional[None] should not be offered a fix
-foo: Optional[None] = None

crates/ruff_linter/resources/test/fixtures/pyupgrade/UP050.py

@@ -1,84 +0,0 @@
-class A:
-    ...
-
-
-class A(metaclass=type):
-    ...
-
-
-class A(
-    metaclass=type
-):
-    ...
-
-
-class A(
-    metaclass=type
-    #
-):
-    ...
-
-
-class A(
-    #
-    metaclass=type
-):
-    ...
-
-
-class A(
-    metaclass=type,
-    #
-):
-    ...
-
-
-class A(
-    #
-    metaclass=type,
-    #
-):
-    ...
-
-
-class B(A, metaclass=type):
-    ...
-
-
-class B(
-    A,
-    metaclass=type,
-):
-    ...
-
-
-class B(
-    A,
-    # comment
-    metaclass=type,
-):
-    ...
-
-
-def foo():
-    class A(metaclass=type):
-        ...
-
-
-class A(
-    metaclass=type  # comment
-    ,
-):
-    ...
-
-
-type = str
-
-class Foo(metaclass=type):
-    ...
-
-
-import builtins
-
-class A(metaclass=builtins.type):
-    ...

crates/ruff_linter/resources/test/fixtures/refurb/FURB122.py

@@ -174,43 +174,3 @@ def _():
         global global_foo
         for [a, b, (global_foo, c)] in d:
             f.write((a, b))
-
-
-# Test cases for lambda and ternary expressions - https://github.com/astral-sh/ruff/issues/18590
-
-def _():
-    with Path("file.txt").open("w", encoding="utf-8") as f:
-        for l in lambda: 0:
-            f.write(f"[{l}]")
-
-
-def _():
-    with Path("file.txt").open("w", encoding="utf-8") as f:
-        for l in (1,) if True else (2,):
-            f.write(f"[{l}]")
-
-
-# don't need to add parentheses when making a function argument
-def _():
-    with open("file", "w") as f:
-        for line in lambda: 0:
-            f.write(line)
-
-
-def _():
-    with open("file", "w") as f:
-        for line in (1,) if True else (2,):
-            f.write(line)
-
-
-# don't add extra parentheses if they're already parenthesized
-def _():
-    with open("file", "w") as f:
-        for line in (lambda: 0):
-            f.write(f"{line}")
-
-
-def _():
-    with open("file", "w") as f:
-        for line in ((1,) if True else (2,)):
-            f.write(f"{line}")

crates/ruff_linter/resources/test/fixtures/refurb/FURB129.py

@@ -43,6 +43,7 @@ def func():
 
 import builtins
 
+
 with builtins.open("FURB129.py") as f:
     for line in f.readlines():
         pass
@@ -50,6 +51,7 @@ with builtins.open("FURB129.py") as f:
 
 from builtins import open as o
 
+
 with o("FURB129.py") as f:
     for line in f.readlines():
         pass
@@ -87,21 +89,3 @@ with open("FURB129.py") as f:
         pass
     for _not_line in f.readline():
         pass
-
-# https://github.com/astral-sh/ruff/issues/18231
-with open("furb129.py") as f:
-    for line in (f).readlines():
-        pass
-
-with open("furb129.py") as f:
-    [line for line in (f).readlines()]
-
-
-with open("furb129.py") as f:
-    for line in (((f))).readlines():
-        pass
-    for line in(f).readlines():
-        pass
-
-    # Test case for issue #17683 (missing space before keyword)
-    print([line for line in f.readlines()if True])

crates/ruff_linter/resources/test/fixtures/refurb/FURB142.py

@@ -74,28 +74,3 @@ async def f(y):
 def g():
     for x in (set(),):
         x.add(x)
-
-
-# Test cases for lambda and ternary expressions - https://github.com/astral-sh/ruff/issues/18590
-
-s = set()
-
-for x in lambda: 0:
-    s.discard(-x)
-
-for x in (1,) if True else (2,):
-    s.add(-x)
-
-# don't add extra parens
-for x in (lambda: 0):
-    s.discard(-x)
-
-for x in ((1,) if True else (2,)):
-    s.add(-x)
-
-# don't add parens directly in function call
-for x in lambda: 0:
-    s.discard(x)
-
-for x in (1,) if True else (2,):
-    s.add(x)

crates/ruff_linter/resources/test/fixtures/refurb/FURB163.py

@@ -43,33 +43,3 @@ log(1, math.e)
 
 math.log(1, 2.0001)
 math.log(1, 10.0001)
-
-
-# see: https://github.com/astral-sh/ruff/issues/18639
-math.log(1, 10 # comment
-         )
-
-math.log(1,
-         10 # comment
-         )
-
-math.log(1 # comment
-         , # comment
-         10 # comment
-         )
-
-math.log(
-    1 # comment
-    ,
-    10 # comment
-)
-
-math.log(4.13e223, 2)
-math.log(4.14e223, 10)
-
-
-def print_log(*args):
-    try:
-        print(math.log(*args, math.e))
-    except TypeError as e:
-        print(repr(e))

crates/ruff_linter/resources/test/fixtures/refurb/FURB171_1.py

@@ -1,53 +0,0 @@
-# Errors.
-
-if 1 in set([1]):
-    print("Single-element set")
-
-if 1 in set((1,)):
-    print("Single-element set")
-
-if 1 in set({1}):
-    print("Single-element set")
-
-if 1 in frozenset([1]):
-    print("Single-element set")
-
-if 1 in frozenset((1,)):
-    print("Single-element set")
-
-if 1 in frozenset({1}):
-    print("Single-element set")
-
-if 1 in set(set([1])):
-    print('Recursive solution')
-
-
-
-# Non-errors.
-
-if 1 in set((1, 2)):
-    pass
-
-if 1 in set([1, 2]):
-    pass
-
-if 1 in set({1, 2}):
-    pass
-
-if 1 in frozenset((1, 2)):
-    pass
-
-if 1 in frozenset([1, 2]):
-    pass
-
-if 1 in frozenset({1, 2}):
-    pass
-
-if 1 in set(1,):
-    pass
-
-if 1 in set(1,2):
-    pass
-
-if 1 in set((x for x in range(2))):
-    pass

crates/ruff_linter/resources/test/fixtures/ruff/RUF037.py

@@ -56,38 +56,3 @@ def f():
 
 def f():
     queue = deque()  # Ok
-
-def f():
-    x = 0 or(deque)([])
-
-
-# regression tests for https://github.com/astral-sh/ruff/issues/18612
-def f():
-    deque([], *[10])  # RUF037 but no fix
-    deque([], **{"maxlen": 10})  # RUF037
-    deque([], foo=1)  # RUF037
-
-
-# Somewhat related to the issue, both okay because we can't generally look
-# inside *args or **kwargs
-def f():
-    deque(*([], 10))  # Ok
-    deque(**{"iterable": [], "maxlen": 10})  # Ok
-
-# The fix was actually always unsafe in the presence of comments. all of these
-# are deleted
-def f():
-    deque(  # a comment in deque, deleted
-        [  # a comment _in_ the list, deleted
-        ],  # a comment after the list, deleted
-        maxlen=10,  # a comment on maxlen, deleted
-        )  # only this is preserved
-
-
-# `maxlen` can also be passed positionally
-def f():
-    deque([], 10)
-
-
-def f():
-    deque([], iterable=[])

crates/ruff_linter/resources/test/fixtures/ruff/RUF056.py

@@ -149,39 +149,23 @@ value = not my_dict.get("key", 0)  # [RUF056]
 value = not my_dict.get("key", 0.0)  # [RUF056]
 value = not my_dict.get("key", "")  # [RUF056]
 
+# testing dict.get call using kwargs
+value = not my_dict.get(key="key", default=False)  # [RUF056]
+value = not my_dict.get(default=[], key="key")  # [RUF056]
+
 # testing invalid dict.get call with inline comment
 value = not my_dict.get("key", # comment1
                      [] # comment2
                      ) # [RUF056]
 
-# regression tests for https://github.com/astral-sh/ruff/issues/18628
-# we should avoid fixes when there are "unknown" arguments present, including
-# extra positional arguments, either of the positional-only arguments passed as
-# a keyword, or completely unknown keywords.
+# testing invalid dict.get call with kwargs and inline comment
+value = not my_dict.get(key="key", # comment1
+                        default=False # comment2
+                        )  # [RUF056]
+value = not my_dict.get(default=[], # comment1
+                        key="key" # comment2
+                        )  # [RUF056]
 
-# extra positional
-not my_dict.get("key", False, "?!")
-
-# `default` is positional-only, so these are invalid
-not my_dict.get("key", default=False)
-not my_dict.get(key="key", default=False)
-not my_dict.get(default=[], key="key")
-not my_dict.get(default=False)
-not my_dict.get(key="key", other="something", default=False)
-not my_dict.get(default=False, other="something", key="test")
-
-# comments don't really matter here because of the kwargs but include them for
-# completeness
-not my_dict.get(
-    key="key",  # comment1
-    default=False,  # comment2
-)  # comment 3
-not my_dict.get(
-    default=[],  # comment1
-    key="key",  # comment2
-)  # comment 3
-
-# the fix is arguably okay here because the same `takes no keyword arguments`
-# TypeError is raised at runtime before and after the fix, but we still bail
-# out for having an unrecognized number of arguments
-not my_dict.get("key", False, foo=...)
+# testing invalid dict.get calls
+value = not my_dict.get(key="key", other="something", default=False)
+value = not my_dict.get(default=False, other="something", key="test")

crates/ruff_linter/resources/test/fixtures/ruff/RUF059_0.py

@@ -94,9 +94,3 @@ def f():
         (exponential := (exponential * base_multiplier) % 3): i + 1 for i in range(2)
     }
     return hash_map
-
-
-# see: https://github.com/astral-sh/ruff/issues/18507
-def f(_x):
-    x, = "1"
-    print(_x)

crates/ruff_linter/resources/test/fixtures/ruff/RUF061_deprecated_call.py

@@ -1,25 +0,0 @@
-import warnings
-import pytest
-
-
-def raise_deprecation_warning(s):
-    warnings.warn(s, DeprecationWarning)
-    return s
-
-
-def test_ok():
-    with pytest.deprecated_call():
-        raise_deprecation_warning("")
-
-
-def test_error_trivial():
-    pytest.deprecated_call(raise_deprecation_warning, "deprecated")
-
-
-def test_error_assign():
-    s = pytest.deprecated_call(raise_deprecation_warning, "deprecated")
-    print(s)
-
-
-def test_error_lambda():
-    pytest.deprecated_call(lambda: warnings.warn("", DeprecationWarning))

crates/ruff_linter/resources/test/fixtures/ruff/RUF061_raises.py

@@ -1,40 +0,0 @@
-import pytest
-
-
-def func(a, b):
-    return a / b
-
-
-def test_ok():
-    with pytest.raises(ValueError):
-        raise ValueError
-
-
-def test_ok_as():
-    with pytest.raises(ValueError) as excinfo:
-        raise ValueError
-
-
-def test_error_trivial():
-    pytest.raises(ZeroDivisionError, func, 1, b=0)
-
-
-def test_error_match():
-    pytest.raises(ZeroDivisionError, func, 1, b=0).match("division by zero")
-
-
-def test_error_assign():
-    excinfo = pytest.raises(ZeroDivisionError, func, 1, b=0)
-
-
-def test_error_kwargs():
-    pytest.raises(func=func, expected_exception=ZeroDivisionError)
-
-
-def test_error_multi_statement():
-    excinfo = pytest.raises(ValueError, int, "hello")
-    assert excinfo.match("^invalid literal")
-
-
-def test_error_lambda():
-    pytest.raises(ZeroDivisionError, lambda: 1 / 0)

crates/ruff_linter/resources/test/fixtures/ruff/RUF061_warns.py

@@ -1,25 +0,0 @@
-import warnings
-import pytest
-
-
-def raise_user_warning(s):
-    warnings.warn(s, UserWarning)
-    return s
-
-
-def test_ok():
-    with pytest.warns(UserWarning):
-        raise_user_warning("")
-
-
-def test_error_trivial():
-    pytest.warns(UserWarning, raise_user_warning, "warning")
-
-
-def test_error_assign():
-    s = pytest.warns(UserWarning, raise_user_warning, "warning")
-    print(s)
-
-
-def test_error_lambda():
-    pytest.warns(UserWarning, lambda: warnings.warn("", UserWarning))

crates/ruff_linter/src/checkers/ast/analyze/bindings.rs

@@ -1,6 +1,6 @@
+use ruff_diagnostics::{Diagnostic, Fix};
 use ruff_text_size::Ranged;
 
-use crate::Fix;
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
 use crate::rules::{
@@ -38,64 +38,92 @@ pub(crate) fn bindings(checker: &Checker) {
                     .dummy_variable_rgx
                     .is_match(binding.name(checker.source()))
             {
-                checker
-                    .report_diagnostic(
-                        pyflakes::rules::UnusedVariable {
-                            name: binding.name(checker.source()).to_string(),
-                        },
-                        binding.range(),
-                    )
-                    .try_set_fix(|| {
-                        pyflakes::fixes::remove_exception_handler_assignment(
-                            binding,
-                            checker.locator,
-                        )
+                let mut diagnostic = Diagnostic::new(
+                    pyflakes::rules::UnusedVariable {
+                        name: binding.name(checker.source()).to_string(),
+                    },
+                    binding.range(),
+                );
+                diagnostic.try_set_fix(|| {
+                    pyflakes::fixes::remove_exception_handler_assignment(binding, checker.locator)
                         .map(Fix::safe_edit)
-                    });
+                });
+                checker.report_diagnostic(diagnostic);
             }
         }
         if checker.enabled(Rule::InvalidAllFormat) {
-            pylint::rules::invalid_all_format(checker, binding);
+            if let Some(diagnostic) = pylint::rules::invalid_all_format(binding) {
+                checker.report_diagnostic(diagnostic);
+            }
         }
         if checker.enabled(Rule::InvalidAllObject) {
-            pylint::rules::invalid_all_object(checker, binding);
+            if let Some(diagnostic) = pylint::rules::invalid_all_object(binding) {
+                checker.report_diagnostic(diagnostic);
+            }
         }
         if checker.enabled(Rule::NonAsciiName) {
-            pylint::rules::non_ascii_name(checker, binding);
+            if let Some(diagnostic) = pylint::rules::non_ascii_name(binding, checker.locator) {
+                checker.report_diagnostic(diagnostic);
+            }
         }
         if checker.enabled(Rule::UnconventionalImportAlias) {
-            flake8_import_conventions::rules::unconventional_import_alias(
+            if let Some(diagnostic) = flake8_import_conventions::rules::unconventional_import_alias(
                 checker,
                 binding,
                 &checker.settings.flake8_import_conventions.aliases,
-            );
+            ) {
+                checker.report_diagnostic(diagnostic);
+            }
         }
         if checker.enabled(Rule::UnaliasedCollectionsAbcSetImport) {
-            flake8_pyi::rules::unaliased_collections_abc_set_import(checker, binding);
+            if let Some(diagnostic) =
+                flake8_pyi::rules::unaliased_collections_abc_set_import(checker, binding)
+            {
+                checker.report_diagnostic(diagnostic);
+            }
         }
         if !checker.source_type.is_stub() && checker.enabled(Rule::UnquotedTypeAlias) {
             flake8_type_checking::rules::unquoted_type_alias(checker, binding);
         }
         if checker.enabled(Rule::UnsortedDunderSlots) {
-            ruff::rules::sort_dunder_slots(checker, binding);
+            if let Some(diagnostic) = ruff::rules::sort_dunder_slots(checker, binding) {
+                checker.report_diagnostic(diagnostic);
+            }
         }
         if checker.enabled(Rule::UsedDummyVariable) {
-            ruff::rules::used_dummy_variable(checker, binding, binding_id);
+            if let Some(diagnostic) = ruff::rules::used_dummy_variable(checker, binding, binding_id)
+            {
+                checker.report_diagnostic(diagnostic);
+            }
         }
         if checker.enabled(Rule::AssignmentInAssert) {
-            ruff::rules::assignment_in_assert(checker, binding);
+            if let Some(diagnostic) = ruff::rules::assignment_in_assert(checker, binding) {
+                checker.report_diagnostic(diagnostic);
+            }
         }
         if checker.enabled(Rule::PytestUnittestRaisesAssertion) {
-            flake8_pytest_style::rules::unittest_raises_assertion_binding(checker, binding);
+            if let Some(diagnostic) =
+                flake8_pytest_style::rules::unittest_raises_assertion_binding(checker, binding)
+            {
+                checker.report_diagnostic(diagnostic);
+            }
         }
         if checker.enabled(Rule::ForLoopWrites) {
-            refurb::rules::for_loop_writes_binding(checker, binding);
+            if let Some(diagnostic) = refurb::rules::for_loop_writes_binding(checker, binding) {
+                checker.report_diagnostic(diagnostic);
+            }
         }
         if checker.enabled(Rule::CustomTypeVarForSelf) {
-            flake8_pyi::rules::custom_type_var_instead_of_self(checker, binding);
+            if let Some(diagnostic) =
+                flake8_pyi::rules::custom_type_var_instead_of_self(checker, binding)
+            {
+                checker.report_diagnostic(diagnostic);
+            }
         }
         if checker.enabled(Rule::PrivateTypeParameter) {
-            pyupgrade::rules::private_type_parameter(checker, binding);
+            if let Some(diagnostic) = pyupgrade::rules::private_type_parameter(checker, binding) {
+                checker.report_diagnostic(diagnostic);
+            }
         }
     }
 }

crates/ruff_linter/src/checkers/ast/analyze/deferred_scopes.rs

@@ -1,9 +1,9 @@
+use ruff_diagnostics::{Diagnostic, Fix};
 use ruff_python_semantic::analyze::visibility;
 use ruff_python_semantic::{Binding, BindingKind, Imported, ResolvedReference, ScopeKind};
 use ruff_text_size::Ranged;
 use rustc_hash::FxHashMap;
 
-use crate::Fix;
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
 use crate::fix;
@@ -112,12 +112,12 @@ pub(crate) fn deferred_scopes(checker: &Checker) {
                         .map(|id| checker.semantic.reference(*id))
                         .all(ResolvedReference::is_load)
                     {
-                        checker.report_diagnostic(
+                        checker.report_diagnostic(Diagnostic::new(
                             pylint::rules::GlobalVariableNotAssigned {
                                 name: (*name).to_string(),
                             },
                             binding.range(),
-                        );
+                        ));
                     }
                 }
             }
@@ -146,12 +146,12 @@ pub(crate) fn deferred_scopes(checker: &Checker) {
                     if scope.kind.is_generator() {
                         continue;
                     }
-                    checker.report_diagnostic(
+                    checker.report_diagnostic(Diagnostic::new(
                         pylint::rules::RedefinedArgumentFromLocal {
                             name: name.to_string(),
                         },
                         binding.range(),
-                    );
+                    ));
                 }
             }
         }
@@ -186,13 +186,13 @@ pub(crate) fn deferred_scopes(checker: &Checker) {
                         continue;
                     }
 
-                    checker.report_diagnostic(
+                    checker.report_diagnostic(Diagnostic::new(
                         pyflakes::rules::ImportShadowedByLoopVar {
                             name: name.to_string(),
                             row: checker.compute_source_row(shadowed.start()),
                         },
                         binding.range(),
-                    );
+                    ));
                 }
             }
         }
@@ -331,7 +331,7 @@ pub(crate) fn deferred_scopes(checker: &Checker) {
             // Create diagnostics for each statement.
             for (source, entries) in &redefinitions {
                 for (shadowed, binding) in entries {
-                    let mut diagnostic = checker.report_diagnostic(
+                    let mut diagnostic = Diagnostic::new(
                         pyflakes::rules::RedefinedWhileUnused {
                             name: binding.name(checker.source()).to_string(),
                             row: checker.compute_source_row(shadowed.start()),
@@ -346,6 +346,8 @@ pub(crate) fn deferred_scopes(checker: &Checker) {
                     if let Some(fix) = source.as_ref().and_then(|source| fixes.get(source)) {
                         diagnostic.set_fix(fix.clone());
                     }
+
+                    checker.report_diagnostic(diagnostic);
                 }
             }
         }

crates/ruff_linter/src/checkers/ast/analyze/except_handler.rs

@@ -15,10 +15,16 @@ pub(crate) fn except_handler(except_handler: &ExceptHandler, checker: &Checker)
             name,
             body,
             range: _,
-            node_index: _,
         }) => {
             if checker.enabled(Rule::BareExcept) {
-                pycodestyle::rules::bare_except(checker, type_.as_deref(), body, except_handler);
+                if let Some(diagnostic) = pycodestyle::rules::bare_except(
+                    type_.as_deref(),
+                    body,
+                    except_handler,
+                    checker.locator,
+                ) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.enabled(Rule::RaiseWithoutFromInsideExcept) {
                 flake8_bugbear::rules::raise_without_from_inside_except(

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

@@ -1,6 +1,8 @@
 use ruff_python_ast::{self as ast, Arguments, Expr, ExprContext, Operator};
 use ruff_python_literal::cformat::{CFormatError, CFormatErrorType};
 
+use ruff_diagnostics::Diagnostic;
+
 use ruff_python_ast::types::Node;
 use ruff_python_semantic::ScopeKind;
 use ruff_python_semantic::analyze::typing;
@@ -176,43 +178,34 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             if checker.enabled(Rule::Airflow3Removal) {
                 airflow::rules::airflow_3_removal_expr(checker, expr);
             }
-            if checker.enabled(Rule::MissingMaxsplitArg) {
-                pylint::rules::missing_maxsplit_arg(checker, value, slice, expr);
-            }
             pandas_vet::rules::subscript(checker, value, expr);
         }
         Expr::Tuple(ast::ExprTuple {
             elts,
             ctx,
             range: _,
-            node_index: _,
             parenthesized: _,
         })
         | Expr::List(ast::ExprList {
             elts,
             ctx,
             range: _,
-            node_index: _,
         }) => {
             if ctx.is_store() {
                 let check_too_many_expressions = checker.enabled(Rule::ExpressionsInStarAssignment);
                 let check_two_starred_expressions =
                     checker.enabled(Rule::MultipleStarredExpressions);
-                pyflakes::rules::starred_expressions(
-                    checker,
+                if let Some(diagnostic) = pyflakes::rules::starred_expressions(
                     elts,
                     check_too_many_expressions,
                     check_two_starred_expressions,
                     expr.range(),
-                );
+                ) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
         }
-        Expr::Name(ast::ExprName {
-            id,
-            ctx,
-            range,
-            node_index: _,
-        }) => {
+        Expr::Name(ast::ExprName { id, ctx, range }) => {
             match ctx {
                 ExprContext::Load => {
                     if checker.enabled(Rule::TypingTextStrAlias) {
@@ -479,10 +472,8 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                         args,
                         keywords,
                         range: _,
-                        node_index: _,
                     },
                 range: _,
-                node_index: _,
             },
         ) => {
             if checker.any_enabled(&[
@@ -536,12 +527,12 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                             match pyflakes::format::FormatSummary::try_from(string_value.to_str()) {
                                 Err(e) => {
                                     if checker.enabled(Rule::StringDotFormatInvalidFormat) {
-                                        checker.report_diagnostic(
+                                        checker.report_diagnostic(Diagnostic::new(
                                             pyflakes::rules::StringDotFormatInvalidFormat {
                                                 message: pyflakes::format::error_to_string(&e),
                                             },
                                             location,
-                                        );
+                                        ));
                                     }
                                 }
                                 Ok(summary) => {
@@ -945,7 +936,9 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 pylint::rules::repeated_keyword_argument(checker, call);
             }
             if checker.enabled(Rule::PytestPatchWithLambda) {
-                flake8_pytest_style::rules::patch_with_lambda(checker, call);
+                if let Some(diagnostic) = flake8_pytest_style::rules::patch_with_lambda(call) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.any_enabled(&[
                 Rule::PytestParametrizeNamesWrongType,
@@ -975,9 +968,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             ]) {
                 flake8_pytest_style::rules::raises_call(checker, call);
             }
-            if checker.enabled(Rule::LegacyFormPytestRaises) {
-                ruff::rules::legacy_raises_warns_deprecated_call(checker, call);
-            }
             if checker.any_enabled(&[Rule::PytestWarnsWithoutWarning, Rule::PytestWarnsTooBroad]) {
                 flake8_pytest_style::rules::warns_call(checker, call);
             }
@@ -1051,7 +1041,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 Rule::OsPathGetctime,
                 Rule::Glob,
                 Rule::OsListdir,
-                Rule::OsSymlink,
             ]) {
                 flake8_use_pathlib::rules::replaceable_by_pathlib(checker, call);
             }
@@ -1273,7 +1262,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 op: Operator::Mod,
                 right,
                 range: _,
-                node_index: _,
             },
         ) => {
             if let Expr::StringLiteral(format_string @ ast::ExprStringLiteral { value, .. }) =
@@ -1297,22 +1285,22 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                             ..
                         }) => {
                             if checker.enabled(Rule::PercentFormatUnsupportedFormatCharacter) {
-                                checker.report_diagnostic(
+                                checker.report_diagnostic(Diagnostic::new(
                                     pyflakes::rules::PercentFormatUnsupportedFormatCharacter {
                                         char: c,
                                     },
                                     location,
-                                );
+                                ));
                             }
                         }
                         Err(e) => {
                             if checker.enabled(Rule::PercentFormatInvalidFormat) {
-                                checker.report_diagnostic(
+                                checker.report_diagnostic(Diagnostic::new(
                                     pyflakes::rules::PercentFormatInvalidFormat {
                                         message: e.to_string(),
                                     },
                                     location,
-                                );
+                                ));
                             }
                         }
                         Ok(summary) => {
@@ -1376,7 +1364,13 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             op: Operator::Add, ..
         }) => {
             if checker.enabled(Rule::ExplicitStringConcatenation) {
-                flake8_implicit_str_concat::rules::explicit(checker, expr);
+                if let Some(diagnostic) = flake8_implicit_str_concat::rules::explicit(
+                    expr,
+                    checker.locator,
+                    checker.settings,
+                ) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.enabled(Rule::CollectionLiteralConcatenation) {
                 ruff::rules::collection_literal_concatenation(checker, expr);
@@ -1439,7 +1433,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 op,
                 operand,
                 range: _,
-                node_index: _,
             },
         ) => {
             if checker.any_enabled(&[Rule::NotInTest, Rule::NotIsTest]) {
@@ -1466,7 +1459,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 ops,
                 comparators,
                 range: _,
-                node_index: _,
             },
         ) => {
             if checker.any_enabled(&[Rule::NoneComparison, Rule::TrueFalseComparison]) {
@@ -1545,13 +1537,7 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 refurb::rules::math_constant(checker, number_literal);
             }
         }
-        Expr::StringLiteral(
-            string_like @ ast::ExprStringLiteral {
-                value,
-                range: _,
-                node_index: _,
-            },
-        ) => {
+        Expr::StringLiteral(string_like @ ast::ExprStringLiteral { value, range: _ }) => {
             if checker.enabled(Rule::UnicodeKindPrefix) {
                 for string_part in value {
                     pyupgrade::rules::unicode_kind_prefix(checker, string_part);
@@ -1572,7 +1558,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 body,
                 orelse,
                 range: _,
-                node_index: _,
             },
         ) => {
             if checker.enabled(Rule::IfElseBlockInsteadOfDictGet) {
@@ -1607,7 +1592,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 elt,
                 generators,
                 range: _,
-                node_index: _,
             },
         ) => {
             if checker.enabled(Rule::UnnecessaryListIndexLookup) {
@@ -1638,7 +1622,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 elt,
                 generators,
                 range: _,
-                node_index: _,
             },
         ) => {
             if checker.enabled(Rule::UnnecessaryListIndexLookup) {
@@ -1670,7 +1653,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 value,
                 generators,
                 range: _,
-                node_index: _,
             },
         ) => {
             if checker.enabled(Rule::UnnecessaryListIndexLookup) {
@@ -1709,7 +1691,6 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                 generators,
                 elt: _,
                 range: _,
-                node_index: _,
                 parenthesized: _,
             },
         ) => {

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

@@ -1,3 +1,4 @@
+use ruff_diagnostics::Diagnostic;
 use ruff_python_ast::helpers;
 use ruff_python_ast::types::Node;
 use ruff_python_ast::{self as ast, Expr, Stmt};
@@ -18,11 +19,7 @@ use ruff_python_ast::PythonVersion;
 /// Run lint rules over a [`Stmt`] syntax node.
 pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
     match stmt {
-        Stmt::Global(ast::StmtGlobal {
-            names,
-            range: _,
-            node_index: _,
-        }) => {
+        Stmt::Global(ast::StmtGlobal { names, range: _ }) => {
             if checker.enabled(Rule::GlobalAtModuleLevel) {
                 pylint::rules::global_at_module_level(checker, stmt);
             }
@@ -32,13 +29,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 }
             }
         }
-        Stmt::Nonlocal(
-            nonlocal @ ast::StmtNonlocal {
-                names,
-                range: _,
-                node_index: _,
-            },
-        ) => {
+        Stmt::Nonlocal(nonlocal @ ast::StmtNonlocal { names, range: _ }) => {
             if checker.enabled(Rule::AmbiguousVariableName) {
                 for name in names {
                     pycodestyle::rules::ambiguous_variable_name(checker, name, name.range());
@@ -48,12 +39,12 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 if !checker.semantic.scope_id.is_global() {
                     for name in names {
                         if checker.semantic.nonlocal(name).is_none() {
-                            checker.report_diagnostic(
+                            checker.report_diagnostic(Diagnostic::new(
                                 pylint::rules::NonlocalWithoutBinding {
                                     name: name.to_string(),
                                 },
                                 name.range(),
-                            );
+                            ));
                         }
                     }
                 }
@@ -64,20 +55,22 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
         }
         Stmt::Break(_) => {
             if checker.enabled(Rule::BreakOutsideLoop) {
-                pyflakes::rules::break_outside_loop(
-                    checker,
+                if let Some(diagnostic) = pyflakes::rules::break_outside_loop(
                     stmt,
                     &mut checker.semantic.current_statements().skip(1),
-                );
+                ) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
         }
         Stmt::Continue(_) => {
             if checker.enabled(Rule::ContinueOutsideLoop) {
-                pyflakes::rules::continue_outside_loop(
-                    checker,
+                if let Some(diagnostic) = pyflakes::rules::continue_outside_loop(
                     stmt,
                     &mut checker.semantic.current_statements().skip(1),
-                );
+                ) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
         }
         Stmt::FunctionDef(
@@ -90,7 +83,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 body,
                 type_params: _,
                 range: _,
-                node_index: _,
             },
         ) => {
             if checker.enabled(Rule::DjangoNonLeadingReceiverDecorator) {
@@ -106,7 +98,9 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 fastapi::rules::fastapi_unused_path_parameter(checker, function_def);
             }
             if checker.enabled(Rule::AmbiguousFunctionName) {
-                pycodestyle::rules::ambiguous_function_name(checker, name);
+                if let Some(diagnostic) = pycodestyle::rules::ambiguous_function_name(name) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.enabled(Rule::InvalidBoolReturnType) {
                 pylint::rules::invalid_bool_return(checker, function_def);
@@ -127,14 +121,15 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::invalid_str_return(checker, function_def);
             }
             if checker.enabled(Rule::InvalidFunctionName) {
-                pep8_naming::rules::invalid_function_name(
-                    checker,
+                if let Some(diagnostic) = pep8_naming::rules::invalid_function_name(
                     stmt,
                     name,
                     decorator_list,
                     &checker.settings.pep8_naming.ignore_names,
                     &checker.semantic,
-                );
+                ) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.source_type.is_stub() {
                 if checker.enabled(Rule::PassStatementStubBody) {
@@ -184,13 +179,14 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 flake8_pyi::rules::pep_484_positional_parameter(checker, function_def);
             }
             if checker.enabled(Rule::DunderFunctionName) {
-                pep8_naming::rules::dunder_function_name(
-                    checker,
+                if let Some(diagnostic) = pep8_naming::rules::dunder_function_name(
                     checker.semantic.current_scope(),
                     stmt,
                     name,
                     &checker.settings.pep8_naming.ignore_names,
-                );
+                ) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.enabled(Rule::GlobalStatement) {
                 pylint::rules::global_statement(checker, name);
@@ -235,13 +231,14 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 );
             }
             if checker.enabled(Rule::ComplexStructure) {
-                mccabe::rules::function_is_too_complex(
-                    checker,
+                if let Some(diagnostic) = mccabe::rules::function_is_too_complex(
                     stmt,
                     name,
                     body,
                     checker.settings.mccabe.max_complexity,
-                );
+                ) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.enabled(Rule::HardcodedPasswordDefault) {
                 flake8_bandit::rules::hardcoded_password_default(checker, parameters);
@@ -261,28 +258,31 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::too_many_positional_arguments(checker, function_def);
             }
             if checker.enabled(Rule::TooManyReturnStatements) {
-                pylint::rules::too_many_return_statements(
-                    checker,
+                if let Some(diagnostic) = pylint::rules::too_many_return_statements(
                     stmt,
                     body,
                     checker.settings.pylint.max_returns,
-                );
+                ) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.enabled(Rule::TooManyBranches) {
-                pylint::rules::too_many_branches(
-                    checker,
+                if let Some(diagnostic) = pylint::rules::too_many_branches(
                     stmt,
                     body,
                     checker.settings.pylint.max_branches,
-                );
+                ) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.enabled(Rule::TooManyStatements) {
-                pylint::rules::too_many_statements(
-                    checker,
+                if let Some(diagnostic) = pylint::rules::too_many_statements(
                     stmt,
                     body,
                     checker.settings.pylint.max_statements,
-                );
+                ) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.any_enabled(&[
                 Rule::PytestFixtureIncorrectParenthesesStyle,
@@ -392,7 +392,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 decorator_list,
                 body,
                 range: _,
-                node_index: _,
             },
         ) => {
             if checker.enabled(Rule::NoClassmethodDecorator) {
@@ -440,9 +439,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             if checker.enabled(Rule::UselessObjectInheritance) {
                 pyupgrade::rules::useless_object_inheritance(checker, class_def);
             }
-            if checker.enabled(Rule::UselessClassMetaclassType) {
-                pyupgrade::rules::useless_class_metaclass_type(checker, class_def);
-            }
             if checker.enabled(Rule::ReplaceStrEnum) {
                 if checker.target_version() >= PythonVersion::PY311 {
                     pyupgrade::rules::replace_str_enum(checker, class_def);
@@ -452,24 +448,28 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pyupgrade::rules::unnecessary_class_parentheses(checker, class_def);
             }
             if checker.enabled(Rule::AmbiguousClassName) {
-                pycodestyle::rules::ambiguous_class_name(checker, name);
+                if let Some(diagnostic) = pycodestyle::rules::ambiguous_class_name(name) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.enabled(Rule::InvalidClassName) {
-                pep8_naming::rules::invalid_class_name(
-                    checker,
+                if let Some(diagnostic) = pep8_naming::rules::invalid_class_name(
                     stmt,
                     name,
                     &checker.settings.pep8_naming.ignore_names,
-                );
+                ) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.enabled(Rule::ErrorSuffixOnExceptionName) {
-                pep8_naming::rules::error_suffix_on_exception_name(
-                    checker,
+                if let Some(diagnostic) = pep8_naming::rules::error_suffix_on_exception_name(
                     stmt,
                     arguments.as_deref(),
                     name,
                     &checker.settings.pep8_naming.ignore_names,
-                );
+                ) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if !checker.source_type.is_stub() {
                 if checker.any_enabled(&[
@@ -554,11 +554,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 ruff::rules::implicit_class_var_in_dataclass(checker, class_def);
             }
         }
-        Stmt::Import(ast::StmtImport {
-            names,
-            range: _,
-            node_index: _,
-        }) => {
+        Stmt::Import(ast::StmtImport { names, range: _ }) => {
             if checker.enabled(Rule::MultipleImportsOnOneLine) {
                 pycodestyle::rules::multiple_imports_on_one_line(checker, stmt, names);
             }
@@ -612,7 +608,11 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 }
 
                 if checker.enabled(Rule::Debugger) {
-                    flake8_debugger::rules::debugger_import(checker, stmt, None, &alias.name);
+                    if let Some(diagnostic) =
+                        flake8_debugger::rules::debugger_import(stmt, None, &alias.name)
+                    {
+                        checker.report_diagnostic(diagnostic);
+                    }
                 }
                 if checker.enabled(Rule::BannedApi) {
                     flake8_tidy_imports::rules::banned_api(
@@ -635,74 +635,94 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                     pylint::rules::manual_from_import(checker, stmt, alias, names);
                 }
                 if checker.enabled(Rule::ImportSelf) {
-                    pylint::rules::import_self(checker, alias, checker.module.qualified_name());
+                    if let Some(diagnostic) =
+                        pylint::rules::import_self(alias, checker.module.qualified_name())
+                    {
+                        checker.report_diagnostic(diagnostic);
+                    }
                 }
                 if let Some(asname) = &alias.asname {
                     let name = alias.name.split('.').next_back().unwrap();
                     if checker.enabled(Rule::ConstantImportedAsNonConstant) {
-                        pep8_naming::rules::constant_imported_as_non_constant(
-                            checker,
-                            name,
-                            asname,
-                            alias,
-                            stmt,
-                            &checker.settings.pep8_naming.ignore_names,
-                        );
+                        if let Some(diagnostic) =
+                            pep8_naming::rules::constant_imported_as_non_constant(
+                                name,
+                                asname,
+                                alias,
+                                stmt,
+                                &checker.settings.pep8_naming.ignore_names,
+                            )
+                        {
+                            checker.report_diagnostic(diagnostic);
+                        }
                     }
                     if checker.enabled(Rule::LowercaseImportedAsNonLowercase) {
-                        pep8_naming::rules::lowercase_imported_as_non_lowercase(
-                            checker,
-                            name,
-                            asname,
-                            alias,
-                            stmt,
-                            &checker.settings.pep8_naming.ignore_names,
-                        );
+                        if let Some(diagnostic) =
+                            pep8_naming::rules::lowercase_imported_as_non_lowercase(
+                                name,
+                                asname,
+                                alias,
+                                stmt,
+                                &checker.settings.pep8_naming.ignore_names,
+                            )
+                        {
+                            checker.report_diagnostic(diagnostic);
+                        }
                     }
                     if checker.enabled(Rule::CamelcaseImportedAsLowercase) {
-                        pep8_naming::rules::camelcase_imported_as_lowercase(
-                            checker,
-                            name,
-                            asname,
-                            alias,
-                            stmt,
-                            &checker.settings.pep8_naming.ignore_names,
-                        );
+                        if let Some(diagnostic) =
+                            pep8_naming::rules::camelcase_imported_as_lowercase(
+                                name,
+                                asname,
+                                alias,
+                                stmt,
+                                &checker.settings.pep8_naming.ignore_names,
+                            )
+                        {
+                            checker.report_diagnostic(diagnostic);
+                        }
                     }
                     if checker.enabled(Rule::CamelcaseImportedAsConstant) {
-                        pep8_naming::rules::camelcase_imported_as_constant(
-                            checker,
+                        if let Some(diagnostic) = pep8_naming::rules::camelcase_imported_as_constant(
                             name,
                             asname,
                             alias,
                             stmt,
                             &checker.settings.pep8_naming.ignore_names,
-                        );
+                        ) {
+                            checker.report_diagnostic(diagnostic);
+                        }
                     }
                     if checker.enabled(Rule::CamelcaseImportedAsAcronym) {
-                        pep8_naming::rules::camelcase_imported_as_acronym(
+                        if let Some(diagnostic) = pep8_naming::rules::camelcase_imported_as_acronym(
                             name, asname, alias, stmt, checker,
-                        );
+                        ) {
+                            checker.report_diagnostic(diagnostic);
+                        }
                     }
                 }
                 if checker.enabled(Rule::BannedImportAlias) {
                     if let Some(asname) = &alias.asname {
-                        flake8_import_conventions::rules::banned_import_alias(
-                            checker,
-                            stmt,
-                            &alias.name,
-                            asname,
-                            &checker.settings.flake8_import_conventions.banned_aliases,
-                        );
+                        if let Some(diagnostic) =
+                            flake8_import_conventions::rules::banned_import_alias(
+                                stmt,
+                                &alias.name,
+                                asname,
+                                &checker.settings.flake8_import_conventions.banned_aliases,
+                            )
+                        {
+                            checker.report_diagnostic(diagnostic);
+                        }
                     }
                 }
                 if checker.enabled(Rule::PytestIncorrectPytestImport) {
-                    flake8_pytest_style::rules::import(
-                        checker,
+                    if let Some(diagnostic) = flake8_pytest_style::rules::import(
                         stmt,
                         &alias.name,
                         alias.asname.as_deref(),
-                    );
+                    ) {
+                        checker.report_diagnostic(diagnostic);
+                    }
                 }
                 if checker.enabled(Rule::BuiltinImportShadowing) {
                     flake8_builtins::rules::builtin_import_shadowing(checker, alias);
@@ -715,7 +735,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 module,
                 level,
                 range: _,
-                node_index: _,
             },
         ) => {
             let level = *level;
@@ -815,7 +834,11 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             }
 
             if checker.enabled(Rule::PytestIncorrectPytestImport) {
-                flake8_pytest_style::rules::import_from(checker, stmt, module, level);
+                if let Some(diagnostic) =
+                    flake8_pytest_style::rules::import_from(stmt, module, level)
+                {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.source_type.is_stub() {
                 if checker.enabled(Rule::FutureAnnotationsInStub) {
@@ -830,98 +853,119 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 } else if &alias.name == "*" {
                     if checker.enabled(Rule::UndefinedLocalWithNestedImportStarUsage) {
                         if !matches!(checker.semantic.current_scope().kind, ScopeKind::Module) {
-                            checker.report_diagnostic(
+                            checker.report_diagnostic(Diagnostic::new(
                                 pyflakes::rules::UndefinedLocalWithNestedImportStarUsage {
                                     name: helpers::format_import_from(level, module).to_string(),
                                 },
                                 stmt.range(),
-                            );
+                            ));
                         }
                     }
                     if checker.enabled(Rule::UndefinedLocalWithImportStar) {
-                        checker.report_diagnostic(
+                        checker.report_diagnostic(Diagnostic::new(
                             pyflakes::rules::UndefinedLocalWithImportStar {
                                 name: helpers::format_import_from(level, module).to_string(),
                             },
                             stmt.range(),
-                        );
+                        ));
                     }
                 }
                 if checker.enabled(Rule::RelativeImports) {
-                    flake8_tidy_imports::rules::banned_relative_import(
+                    if let Some(diagnostic) = flake8_tidy_imports::rules::banned_relative_import(
                         checker,
                         stmt,
                         level,
                         module,
                         checker.module.qualified_name(),
                         checker.settings.flake8_tidy_imports.ban_relative_imports,
-                    );
+                    ) {
+                        checker.report_diagnostic(diagnostic);
+                    }
                 }
                 if checker.enabled(Rule::Debugger) {
-                    flake8_debugger::rules::debugger_import(checker, stmt, module, &alias.name);
+                    if let Some(diagnostic) =
+                        flake8_debugger::rules::debugger_import(stmt, module, &alias.name)
+                    {
+                        checker.report_diagnostic(diagnostic);
+                    }
                 }
                 if checker.enabled(Rule::BannedImportAlias) {
                     if let Some(asname) = &alias.asname {
                         let qualified_name =
                             helpers::format_import_from_member(level, module, &alias.name);
-                        flake8_import_conventions::rules::banned_import_alias(
-                            checker,
-                            stmt,
-                            &qualified_name,
-                            asname,
-                            &checker.settings.flake8_import_conventions.banned_aliases,
-                        );
+                        if let Some(diagnostic) =
+                            flake8_import_conventions::rules::banned_import_alias(
+                                stmt,
+                                &qualified_name,
+                                asname,
+                                &checker.settings.flake8_import_conventions.banned_aliases,
+                            )
+                        {
+                            checker.report_diagnostic(diagnostic);
+                        }
                     }
                 }
                 if let Some(asname) = &alias.asname {
                     if checker.enabled(Rule::ConstantImportedAsNonConstant) {
-                        pep8_naming::rules::constant_imported_as_non_constant(
-                            checker,
-                            &alias.name,
-                            asname,
-                            alias,
-                            stmt,
-                            &checker.settings.pep8_naming.ignore_names,
-                        );
+                        if let Some(diagnostic) =
+                            pep8_naming::rules::constant_imported_as_non_constant(
+                                &alias.name,
+                                asname,
+                                alias,
+                                stmt,
+                                &checker.settings.pep8_naming.ignore_names,
+                            )
+                        {
+                            checker.report_diagnostic(diagnostic);
+                        }
                     }
                     if checker.enabled(Rule::LowercaseImportedAsNonLowercase) {
-                        pep8_naming::rules::lowercase_imported_as_non_lowercase(
-                            checker,
-                            &alias.name,
-                            asname,
-                            alias,
-                            stmt,
-                            &checker.settings.pep8_naming.ignore_names,
-                        );
+                        if let Some(diagnostic) =
+                            pep8_naming::rules::lowercase_imported_as_non_lowercase(
+                                &alias.name,
+                                asname,
+                                alias,
+                                stmt,
+                                &checker.settings.pep8_naming.ignore_names,
+                            )
+                        {
+                            checker.report_diagnostic(diagnostic);
+                        }
                     }
                     if checker.enabled(Rule::CamelcaseImportedAsLowercase) {
-                        pep8_naming::rules::camelcase_imported_as_lowercase(
-                            checker,
-                            &alias.name,
-                            asname,
-                            alias,
-                            stmt,
-                            &checker.settings.pep8_naming.ignore_names,
-                        );
+                        if let Some(diagnostic) =
+                            pep8_naming::rules::camelcase_imported_as_lowercase(
+                                &alias.name,
+                                asname,
+                                alias,
+                                stmt,
+                                &checker.settings.pep8_naming.ignore_names,
+                            )
+                        {
+                            checker.report_diagnostic(diagnostic);
+                        }
                     }
                     if checker.enabled(Rule::CamelcaseImportedAsConstant) {
-                        pep8_naming::rules::camelcase_imported_as_constant(
-                            checker,
+                        if let Some(diagnostic) = pep8_naming::rules::camelcase_imported_as_constant(
                             &alias.name,
                             asname,
                             alias,
                             stmt,
                             &checker.settings.pep8_naming.ignore_names,
-                        );
+                        ) {
+                            checker.report_diagnostic(diagnostic);
+                        }
                     }
                     if checker.enabled(Rule::CamelcaseImportedAsAcronym) {
-                        pep8_naming::rules::camelcase_imported_as_acronym(
+                        if let Some(diagnostic) = pep8_naming::rules::camelcase_imported_as_acronym(
                             &alias.name,
                             asname,
                             alias,
                             stmt,
                             checker,
-                        );
+                        ) {
+                            checker.report_diagnostic(diagnostic);
+                        }
                     }
                     if !checker.source_type.is_stub() {
                         if checker.enabled(Rule::UselessImportAlias) {
@@ -934,21 +978,23 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 }
             }
             if checker.enabled(Rule::ImportSelf) {
-                pylint::rules::import_from_self(
-                    checker,
+                if let Some(diagnostic) = pylint::rules::import_from_self(
                     level,
                     module,
                     names,
                     checker.module.qualified_name(),
-                );
+                ) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.enabled(Rule::BannedImportFrom) {
-                flake8_import_conventions::rules::banned_import_from(
-                    checker,
+                if let Some(diagnostic) = flake8_import_conventions::rules::banned_import_from(
                     stmt,
                     &helpers::format_import_from(level, module),
                     &checker.settings.flake8_import_conventions.banned_from,
-                );
+                ) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.enabled(Rule::ByteStringUsage) {
                 flake8_pyi::rules::bytestring_import(checker, import_from);
@@ -1159,12 +1205,11 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 test,
                 msg,
                 range: _,
-                node_index: _,
             },
         ) => {
             if !checker.semantic.in_type_checking_block() {
                 if checker.enabled(Rule::Assert) {
-                    flake8_bandit::rules::assert_used(checker, stmt);
+                    checker.report_diagnostic(flake8_bandit::rules::assert_used(stmt));
                 }
             }
             if checker.enabled(Rule::AssertTuple) {
@@ -1261,7 +1306,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 orelse,
                 is_async,
                 range: _,
-                node_index: _,
             },
         ) => {
             if checker.enabled(Rule::TooManyNestedBlocks) {
@@ -1362,7 +1406,11 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 }
             }
             if checker.enabled(Rule::DefaultExceptNotLast) {
-                pyflakes::rules::default_except_not_last(checker, handlers, checker.locator);
+                if let Some(diagnostic) =
+                    pyflakes::rules::default_except_not_last(handlers, checker.locator)
+                {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.any_enabled(&[
                 Rule::DuplicateHandlerException,
@@ -1457,7 +1505,9 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 );
             }
             if checker.enabled(Rule::PandasDfVariableName) {
-                pandas_vet::rules::assignment_to_df(checker, targets);
+                if let Some(diagnostic) = pandas_vet::rules::assignment_to_df(targets) {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker
                 .settings
@@ -1625,13 +1675,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 flake8_pyi::rules::t_suffixed_type_alias(checker, name);
             }
         }
-        Stmt::Delete(
-            delete @ ast::StmtDelete {
-                targets,
-                range: _,
-                node_index: _,
-            },
-        ) => {
+        Stmt::Delete(delete @ ast::StmtDelete { targets, range: _ }) => {
             if checker.enabled(Rule::GlobalStatement) {
                 for target in targets {
                     if let Expr::Name(ast::ExprName { id, .. }) = target {
@@ -1643,13 +1687,7 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 refurb::rules::delete_full_slice(checker, delete);
             }
         }
-        Stmt::Expr(
-            expr @ ast::StmtExpr {
-                value,
-                range: _,
-                node_index: _,
-            },
-        ) => {
+        Stmt::Expr(expr @ ast::StmtExpr { value, range: _ }) => {
             if checker.enabled(Rule::UselessComparison) {
                 flake8_bugbear::rules::useless_comparison(checker, value);
             }
@@ -1663,7 +1701,11 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
                 pylint::rules::named_expr_without_context(checker, value);
             }
             if checker.enabled(Rule::AsyncioDanglingTask) {
-                ruff::rules::asyncio_dangling_task(checker, value, checker.semantic());
+                if let Some(diagnostic) =
+                    ruff::rules::asyncio_dangling_task(value, checker.semantic())
+                {
+                    checker.report_diagnostic(diagnostic);
+                }
             }
             if checker.enabled(Rule::RepeatedAppend) {
                 refurb::rules::repeated_append(checker, stmt);
@@ -1676,7 +1718,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
             subject: _,
             cases,
             range: _,
-            node_index: _,
         }) => {
             if checker.enabled(Rule::NanComparison) {
                 pylint::rules::nan_comparison_match(checker, cases);

crates/ruff_linter/src/checkers/ast/analyze/unresolved_references.rs

@@ -1,3 +1,4 @@
+use ruff_diagnostics::Diagnostic;
 use ruff_python_semantic::Exceptions;
 use ruff_python_stdlib::builtins::version_builtin_was_added;
 
@@ -14,12 +15,12 @@ pub(crate) fn unresolved_references(checker: &Checker) {
     for reference in checker.semantic.unresolved_references() {
         if reference.is_wildcard_import() {
             if checker.enabled(Rule::UndefinedLocalWithImportStarUsage) {
-                checker.report_diagnostic(
+                checker.report_diagnostic(Diagnostic::new(
                     pyflakes::rules::UndefinedLocalWithImportStarUsage {
                         name: reference.name(checker.source()).to_string(),
                     },
                     reference.range(),
-                );
+                ));
             }
         } else {
             if checker.enabled(Rule::UndefinedName) {
@@ -41,13 +42,13 @@ pub(crate) fn unresolved_references(checker: &Checker) {
 
                 let symbol_name = reference.name(checker.source());
 
-                checker.report_diagnostic(
+                checker.report_diagnostic(Diagnostic::new(
                     pyflakes::rules::UndefinedName {
                         name: symbol_name.to_string(),
                         minor_version_builtin_added: version_builtin_was_added(symbol_name),
                     },
                     reference.range(),
-                );
+                ));
             }
         }
     }

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

@@ -26,9 +26,12 @@ use std::path::Path;
 
 use itertools::Itertools;
 use log::debug;
+use ruff_python_parser::semantic_errors::{
+    SemanticSyntaxChecker, SemanticSyntaxContext, SemanticSyntaxError, SemanticSyntaxErrorKind,
+};
 use rustc_hash::{FxHashMap, FxHashSet};
 
-use ruff_diagnostics::IsolationLevel;
+use ruff_diagnostics::{Diagnostic, Edit, IsolationLevel};
 use ruff_notebook::{CellOffsets, NotebookIndex};
 use ruff_python_ast::helpers::{collect_import_from_member, is_docstring_stmt, to_module_path};
 use ruff_python_ast::identifier::Identifier;
@@ -37,15 +40,12 @@ use ruff_python_ast::str::Quote;
 use ruff_python_ast::visitor::{Visitor, walk_except_handler, walk_pattern};
 use ruff_python_ast::{
     self as ast, AnyParameterRef, ArgOrKeyword, Comprehension, ElifElseClause, ExceptHandler, Expr,
-    ExprContext, InterpolatedStringElement, Keyword, MatchCase, ModModule, Parameter, Parameters,
-    Pattern, PythonVersion, Stmt, Suite, UnaryOp,
+    ExprContext, FStringElement, Keyword, MatchCase, ModModule, Parameter, Parameters, Pattern,
+    PythonVersion, Stmt, Suite, UnaryOp,
 };
 use ruff_python_ast::{PySourceType, helpers, str, visitor};
 use ruff_python_codegen::{Generator, Stylist};
 use ruff_python_index::Indexer;
-use ruff_python_parser::semantic_errors::{
-    SemanticSyntaxChecker, SemanticSyntaxContext, SemanticSyntaxError, SemanticSyntaxErrorKind,
-};
 use ruff_python_parser::typing::{AnnotationKind, ParsedAnnotation, parse_type_annotation};
 use ruff_python_parser::{ParseError, Parsed, Tokens};
 use ruff_python_semantic::all::{DunderAllDefinition, DunderAllFlags};
@@ -57,7 +57,7 @@ use ruff_python_semantic::{
 };
 use ruff_python_stdlib::builtins::{MAGIC_GLOBALS, python_builtins};
 use ruff_python_trivia::CommentRanges;
-use ruff_source_file::{OneIndexed, SourceFile, SourceRow};
+use ruff_source_file::{OneIndexed, SourceRow};
 use ruff_text_size::{Ranged, TextRange, TextSize};
 
 use crate::checkers::ast::annotation::AnnotationContext;
@@ -65,15 +65,14 @@ use crate::docstrings::extraction::ExtractionTarget;
 use crate::importer::{ImportRequest, Importer, ResolutionError};
 use crate::noqa::NoqaMapping;
 use crate::package::PackageRoot;
-use crate::preview::is_undefined_export_in_dunder_init_enabled;
-use crate::registry::{AsRule, Rule};
+use crate::preview::{is_semantic_errors_enabled, is_undefined_export_in_dunder_init_enabled};
+use crate::registry::Rule;
 use crate::rules::pyflakes::rules::{
     LateFutureImport, ReturnOutsideFunction, YieldOutsideFunction,
 };
 use crate::rules::pylint::rules::{AwaitOutsideAsync, LoadBeforeGlobalDeclaration};
 use crate::rules::{flake8_pyi, flake8_type_checking, pyflakes, pyupgrade};
 use crate::settings::{LinterSettings, TargetVersion, flags};
-use crate::{Edit, OldDiagnostic, Violation};
 use crate::{Locator, docstrings, noqa};
 
 mod analyze;
@@ -224,6 +223,8 @@ pub(crate) struct Checker<'a> {
     visit: deferred::Visit<'a>,
     /// A set of deferred nodes to be analyzed after the AST traversal (e.g., `for` loops).
     analyze: deferred::Analyze,
+    /// The cumulative set of diagnostics computed across all lint rules.
+    diagnostics: RefCell<Vec<Diagnostic>>,
     /// The list of names already seen by flake8-bugbear diagnostics, to avoid duplicate violations.
     flake8_bugbear_seen: RefCell<FxHashSet<TextRange>>,
     /// The end offset of the last visited statement.
@@ -237,7 +238,6 @@ pub(crate) struct Checker<'a> {
     semantic_checker: SemanticSyntaxChecker,
     /// Errors collected by the `semantic_checker`.
     semantic_errors: RefCell<Vec<SemanticSyntaxError>>,
-    context: &'a LintContext<'a>,
 }
 
 impl<'a> Checker<'a> {
@@ -258,7 +258,6 @@ impl<'a> Checker<'a> {
         cell_offsets: Option<&'a CellOffsets>,
         notebook_index: Option<&'a NotebookIndex>,
         target_version: TargetVersion,
-        context: &'a LintContext<'a>,
     ) -> Checker<'a> {
         let semantic = SemanticModel::new(&settings.typing_modules, path, module);
         Self {
@@ -279,6 +278,7 @@ impl<'a> Checker<'a> {
             semantic,
             visit: deferred::Visit::default(),
             analyze: deferred::Analyze::default(),
+            diagnostics: RefCell::default(),
             flake8_bugbear_seen: RefCell::default(),
             cell_offsets,
             notebook_index,
@@ -287,7 +287,6 @@ impl<'a> Checker<'a> {
             target_version,
             semantic_checker: SemanticSyntaxChecker::new(),
             semantic_errors: RefCell::default(),
-            context,
         }
     }
 }
@@ -338,7 +337,6 @@ impl<'a> Checker<'a> {
         ast::BytesLiteralFlags::empty().with_quote_style(self.preferred_quote())
     }
 
-    // TODO(dylan) add similar method for t-strings
     /// Return the default f-string flags a generated `FString` node should use, given where we are
     /// in the AST.
     pub(crate) fn default_fstring_flags(&self) -> ast::FStringFlags {
@@ -381,30 +379,10 @@ impl<'a> Checker<'a> {
         self.indexer.comment_ranges()
     }
 
-    /// Return a [`DiagnosticGuard`] for reporting a diagnostic.
-    ///
-    /// The guard derefs to a [`Diagnostic`], so it can be used to further modify the diagnostic
-    /// before it is added to the collection in the checker on `Drop`.
-    pub(crate) fn report_diagnostic<'chk, T: Violation>(
-        &'chk self,
-        kind: T,
-        range: TextRange,
-    ) -> DiagnosticGuard<'chk, 'a> {
-        self.context.report_diagnostic(kind, range)
-    }
-
-    /// Return a [`DiagnosticGuard`] for reporting a diagnostic if the corresponding rule is
-    /// enabled.
-    ///
-    /// Prefer [`Checker::report_diagnostic`] in general because the conversion from a `Diagnostic`
-    /// to a `Rule` is somewhat expensive.
-    pub(crate) fn report_diagnostic_if_enabled<'chk, T: Violation>(
-        &'chk self,
-        kind: T,
-        range: TextRange,
-    ) -> Option<DiagnosticGuard<'chk, 'a>> {
-        self.context
-            .report_diagnostic_if_enabled(kind, range, self.settings)
+    /// Push a new [`Diagnostic`] to the collection in the [`Checker`]
+    pub(crate) fn report_diagnostic(&self, diagnostic: Diagnostic) {
+        let mut diagnostics = self.diagnostics.borrow_mut();
+        diagnostics.push(diagnostic);
     }
 
     /// Adds a [`TextRange`] to the set of ranges of variable names
@@ -530,9 +508,9 @@ impl<'a> Checker<'a> {
     }
 
     /// Push `diagnostic` if the checker is not in a `@no_type_check` context.
-    pub(crate) fn report_type_diagnostic<T: Violation>(&self, kind: T, range: TextRange) {
+    pub(crate) fn report_type_diagnostic(&self, diagnostic: Diagnostic) {
         if !self.semantic.in_no_type_check() {
-            self.report_diagnostic(kind, range);
+            self.report_diagnostic(diagnostic);
         }
     }
 
@@ -617,7 +595,7 @@ impl SemanticSyntaxContext for Checker<'_> {
         match error.kind {
             SemanticSyntaxErrorKind::LateFutureImport => {
                 if self.settings.rules.enabled(Rule::LateFutureImport) {
-                    self.report_diagnostic(LateFutureImport, error.range);
+                    self.report_diagnostic(Diagnostic::new(LateFutureImport, error.range));
                 }
             }
             SemanticSyntaxErrorKind::LoadBeforeGlobalDeclaration { name, start } => {
@@ -626,28 +604,31 @@ impl SemanticSyntaxContext for Checker<'_> {
                     .rules
                     .enabled(Rule::LoadBeforeGlobalDeclaration)
                 {
-                    self.report_diagnostic(
+                    self.report_diagnostic(Diagnostic::new(
                         LoadBeforeGlobalDeclaration {
                             name,
                             row: self.compute_source_row(start),
                         },
                         error.range,
-                    );
+                    ));
                 }
             }
             SemanticSyntaxErrorKind::YieldOutsideFunction(kind) => {
                 if self.settings.rules.enabled(Rule::YieldOutsideFunction) {
-                    self.report_diagnostic(YieldOutsideFunction::new(kind), error.range);
+                    self.report_diagnostic(Diagnostic::new(
+                        YieldOutsideFunction::new(kind),
+                        error.range,
+                    ));
                 }
             }
             SemanticSyntaxErrorKind::ReturnOutsideFunction => {
                 if self.settings.rules.enabled(Rule::ReturnOutsideFunction) {
-                    self.report_diagnostic(ReturnOutsideFunction, error.range);
+                    self.report_diagnostic(Diagnostic::new(ReturnOutsideFunction, error.range));
                 }
             }
             SemanticSyntaxErrorKind::AwaitOutsideAsyncFunction(_) => {
                 if self.settings.rules.enabled(Rule::AwaitOutsideAsync) {
-                    self.report_diagnostic(AwaitOutsideAsync, error.range);
+                    self.report_diagnostic(Diagnostic::new(AwaitOutsideAsync, error.range));
                 }
             }
             SemanticSyntaxErrorKind::ReboundComprehensionVariable
@@ -663,7 +644,9 @@ impl SemanticSyntaxContext for Checker<'_> {
             | SemanticSyntaxErrorKind::AsyncComprehensionInSyncComprehension(_)
             | SemanticSyntaxErrorKind::DuplicateParameter(_)
             | SemanticSyntaxErrorKind::NonlocalDeclarationAtModuleLevel => {
-                self.semantic_errors.borrow_mut().push(error);
+                if is_semantic_errors_enabled(self.settings) {
+                    self.semantic_errors.borrow_mut().push(error);
+                }
             }
         }
     }
@@ -834,15 +817,10 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 op: _,
                 value: _,
                 range: _,
-                node_index: _,
             }) => {
                 self.handle_node_load(target);
             }
-            Stmt::Import(ast::StmtImport {
-                names,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::Import(ast::StmtImport { names, range: _ }) => {
                 if self.semantic.at_top_level() {
                     self.importer.visit_import(stmt);
                 }
@@ -896,7 +874,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 module,
                 level,
                 range: _,
-                node_index: _,
             }) => {
                 if self.semantic.at_top_level() {
                     self.importer.visit_import(stmt);
@@ -958,11 +935,7 @@ impl<'a> Visitor<'a> for Checker<'a> {
                     }
                 }
             }
-            Stmt::Global(ast::StmtGlobal {
-                names,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::Global(ast::StmtGlobal { names, range: _ }) => {
                 if !self.semantic.scope_id.is_global() {
                     for name in names {
                         let binding_id = self.semantic.global_scope().get(name);
@@ -984,11 +957,7 @@ impl<'a> Visitor<'a> for Checker<'a> {
                     }
                 }
             }
-            Stmt::Nonlocal(ast::StmtNonlocal {
-                names,
-                range: _,
-                node_index: _,
-            }) => {
+            Stmt::Nonlocal(ast::StmtNonlocal { names, range: _ }) => {
                 if !self.semantic.scope_id.is_global() {
                     for name in names {
                         if let Some((scope_id, binding_id)) = self.semantic.nonlocal(name) {
@@ -1198,7 +1167,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
             }
             Stmt::TypeAlias(ast::StmtTypeAlias {
                 range: _,
-                node_index: _,
                 name,
                 type_params,
                 value,
@@ -1293,7 +1261,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 test,
                 msg,
                 range: _,
-                node_index: _,
             }) => {
                 let snapshot = self.semantic.flags;
                 self.semantic.flags |= SemanticModelFlags::ASSERT_STATEMENT;
@@ -1308,7 +1275,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 body,
                 is_async: _,
                 range: _,
-                node_index: _,
             }) => {
                 for item in items {
                     self.visit_with_item(item);
@@ -1322,7 +1288,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 body,
                 orelse,
                 range: _,
-                node_index: _,
             }) => {
                 self.visit_boolean_test(test);
                 self.visit_body(body);
@@ -1334,7 +1299,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                     body,
                     elif_else_clauses,
                     range: _,
-                    node_index: _,
                 },
             ) => {
                 self.visit_boolean_test(test);
@@ -1454,27 +1418,15 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 func,
                 arguments: _,
                 range: _,
-                node_index: _,
             }) => {
-                if let Expr::Name(ast::ExprName {
-                    id,
-                    ctx,
-                    range: _,
-                    node_index: _,
-                }) = func.as_ref()
-                {
+                if let Expr::Name(ast::ExprName { id, ctx, range: _ }) = func.as_ref() {
                     if id == "locals" && ctx.is_load() {
                         let scope = self.semantic.current_scope_mut();
                         scope.set_uses_locals();
                     }
                 }
             }
-            Expr::Name(ast::ExprName {
-                id,
-                ctx,
-                range: _,
-                node_index: _,
-            }) => match ctx {
+            Expr::Name(ast::ExprName { id, ctx, range: _ }) => match ctx {
                 ExprContext::Load => self.handle_node_load(expr),
                 ExprContext::Store => self.handle_node_store(id, expr),
                 ExprContext::Del => self.handle_node_delete(expr),
@@ -1489,7 +1441,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 elt,
                 generators,
                 range: _,
-                node_index: _,
             }) => {
                 self.visit_generators(GeneratorKind::ListComprehension, generators);
                 self.visit_expr(elt);
@@ -1498,7 +1449,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 elt,
                 generators,
                 range: _,
-                node_index: _,
             }) => {
                 self.visit_generators(GeneratorKind::SetComprehension, generators);
                 self.visit_expr(elt);
@@ -1507,7 +1457,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 elt,
                 generators,
                 range: _,
-                node_index: _,
                 parenthesized: _,
             }) => {
                 self.visit_generators(GeneratorKind::Generator, generators);
@@ -1518,7 +1467,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 value,
                 generators,
                 range: _,
-                node_index: _,
             }) => {
                 self.visit_generators(GeneratorKind::DictComprehension, generators);
                 self.visit_expr(key);
@@ -1529,7 +1477,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                     parameters,
                     body: _,
                     range: _,
-                    node_index: _,
                 },
             ) => {
                 // Visit the default arguments, but avoid the body, which will be deferred.
@@ -1551,7 +1498,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 body,
                 orelse,
                 range: _,
-                node_index: _,
             }) => {
                 self.visit_boolean_test(test);
                 self.visit_expr(body);
@@ -1561,7 +1507,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 op: UnaryOp::Not,
                 operand,
                 range: _,
-                node_index: _,
             }) => {
                 self.visit_boolean_test(operand);
             }
@@ -1569,7 +1514,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 func,
                 arguments,
                 range: _,
-                node_index: _,
             }) => {
                 self.visit_expr(func);
 
@@ -1684,7 +1628,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                                 arg,
                                 value,
                                 range: _,
-                                node_index: _,
                             } = keyword;
                             if let Some(id) = arg {
                                 if matches!(&**id, "bound" | "default") {
@@ -1776,12 +1719,7 @@ impl<'a> Visitor<'a> for Checker<'a> {
                             self.visit_non_type_definition(arg);
                         }
                         for arg in args {
-                            if let Expr::Dict(ast::ExprDict {
-                                items,
-                                range: _,
-                                node_index: _,
-                            }) = arg
-                            {
+                            if let Expr::Dict(ast::ExprDict { items, range: _ }) = arg {
                                 for ast::DictItem { key, value } in items {
                                     if let Some(key) = key {
                                         self.visit_non_type_definition(key);
@@ -1819,7 +1757,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                                     value,
                                     arg,
                                     range: _,
-                                    node_index: _,
                                 } = keyword;
                                 if arg.as_ref().is_some_and(|arg| arg == "type") {
                                     self.visit_type_definition(value);
@@ -1848,7 +1785,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 slice,
                 ctx,
                 range: _,
-                node_index: _,
             }) => {
                 // Only allow annotations in `ExprContext::Load`. If we have, e.g.,
                 // `obj["foo"]["bar"]`, we need to avoid treating the `obj["foo"]`
@@ -1888,7 +1824,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                                 elts,
                                 ctx,
                                 range: _,
-                                node_index: _,
                                 parenthesized: _,
                             }) = slice.as_ref()
                             {
@@ -1913,12 +1848,7 @@ impl<'a> Visitor<'a> for Checker<'a> {
                             }
                         }
                         Some(typing::SubscriptKind::TypedDict) => {
-                            if let Expr::Dict(ast::ExprDict {
-                                items,
-                                range: _,
-                                node_index: _,
-                            }) = slice.as_ref()
-                            {
+                            if let Expr::Dict(ast::ExprDict { items, range: _ }) = slice.as_ref() {
                                 for item in items {
                                     if let Some(key) = &item.key {
                                         self.visit_non_type_definition(key);
@@ -1949,15 +1879,10 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 self.semantic.flags |= SemanticModelFlags::F_STRING;
                 visitor::walk_expr(self, expr);
             }
-            Expr::TString(_) => {
-                self.semantic.flags |= SemanticModelFlags::T_STRING;
-                visitor::walk_expr(self, expr);
-            }
             Expr::Named(ast::ExprNamed {
                 target,
                 value,
                 range: _,
-                node_index: _,
             }) => {
                 self.visit_expr(value);
 
@@ -1987,7 +1912,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
             }
             Expr::BytesLiteral(bytes_literal) => analyze::string_like(bytes_literal.into(), self),
             Expr::FString(f_string) => analyze::string_like(f_string.into(), self),
-            Expr::TString(t_string) => analyze::string_like(t_string.into(), self),
             _ => {}
         }
 
@@ -2007,7 +1931,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 name,
                 body: _,
                 range: _,
-                node_index: _,
             }) => {
                 if let Some(name) = name {
                     // Store the existing binding, if any.
@@ -2082,7 +2005,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
         | Pattern::MatchStar(ast::PatternMatchStar {
             name: Some(name),
             range: _,
-            node_index: _,
         })
         | Pattern::MatchMapping(ast::PatternMatchMapping {
             rest: Some(name), ..
@@ -2142,7 +2064,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 default,
                 name: _,
                 range: _,
-                node_index: _,
             }) => {
                 if let Some(expr) = bound {
                     self.visit
@@ -2159,7 +2080,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 default,
                 name: _,
                 range: _,
-                node_index: _,
             }) => {
                 if let Some(expr) = default {
                     self.visit
@@ -2171,7 +2091,6 @@ impl<'a> Visitor<'a> for Checker<'a> {
                 default,
                 name: _,
                 range: _,
-                node_index: _,
             }) => {
                 if let Some(expr) = default {
                     self.visit
@@ -2182,15 +2101,12 @@ impl<'a> Visitor<'a> for Checker<'a> {
         }
     }
 
-    fn visit_interpolated_string_element(
-        &mut self,
-        interpolated_string_element: &'a InterpolatedStringElement,
-    ) {
+    fn visit_f_string_element(&mut self, f_string_element: &'a FStringElement) {
         let snapshot = self.semantic.flags;
-        if interpolated_string_element.is_interpolation() {
-            self.semantic.flags |= SemanticModelFlags::INTERPOLATED_STRING_REPLACEMENT_FIELD;
+        if f_string_element.is_expression() {
+            self.semantic.flags |= SemanticModelFlags::F_STRING_REPLACEMENT_FIELD;
         }
-        visitor::walk_interpolated_string_element(self, interpolated_string_element);
+        visitor::walk_f_string_element(self, f_string_element);
         self.semantic.flags = snapshot;
     }
 }
@@ -2801,12 +2717,12 @@ impl<'a> Checker<'a> {
                         self.semantic.restore(snapshot);
 
                         if self.enabled(Rule::ForwardAnnotationSyntaxError) {
-                            self.report_type_diagnostic(
+                            self.report_type_diagnostic(Diagnostic::new(
                                 pyflakes::rules::ForwardAnnotationSyntaxError {
                                     parse_error: parse_error.error.to_string(),
                                 },
                                 string_expr.range(),
-                            );
+                            ));
                         }
                     }
                 }
@@ -2890,7 +2806,6 @@ impl<'a> Checker<'a> {
                     parameters,
                     body,
                     range: _,
-                    node_index: _,
                 })) = self.semantic.current_expression()
                 else {
                     unreachable!("Expected Expr::Lambda");
@@ -2948,26 +2863,30 @@ impl<'a> Checker<'a> {
                 } else {
                     if self.semantic.global_scope().uses_star_imports() {
                         if self.enabled(Rule::UndefinedLocalWithImportStarUsage) {
-                            self.report_diagnostic(
-                                pyflakes::rules::UndefinedLocalWithImportStarUsage {
-                                    name: name.to_string(),
-                                },
-                                range,
-                            )
-                            .set_parent(definition.start());
+                            self.diagnostics.get_mut().push(
+                                Diagnostic::new(
+                                    pyflakes::rules::UndefinedLocalWithImportStarUsage {
+                                        name: name.to_string(),
+                                    },
+                                    range,
+                                )
+                                .with_parent(definition.start()),
+                            );
                         }
                     } else {
                         if self.enabled(Rule::UndefinedExport) {
                             if is_undefined_export_in_dunder_init_enabled(self.settings)
                                 || !self.path.ends_with("__init__.py")
                             {
-                                self.report_diagnostic(
-                                    pyflakes::rules::UndefinedExport {
-                                        name: name.to_string(),
-                                    },
-                                    range,
-                                )
-                                .set_parent(definition.start());
+                                self.diagnostics.get_mut().push(
+                                    Diagnostic::new(
+                                        pyflakes::rules::UndefinedExport {
+                                            name: name.to_string(),
+                                        },
+                                        range,
+                                    )
+                                    .with_parent(definition.start()),
+                                );
                             }
                         }
                     }
@@ -3028,8 +2947,7 @@ pub(crate) fn check_ast(
     cell_offsets: Option<&CellOffsets>,
     notebook_index: Option<&NotebookIndex>,
     target_version: TargetVersion,
-    context: &LintContext,
-) -> Vec<SemanticSyntaxError> {
+) -> (Vec<Diagnostic>, Vec<SemanticSyntaxError>) {
     let module_path = package
         .map(PackageRoot::path)
         .and_then(|package| to_module_path(package, path));
@@ -3069,7 +2987,6 @@ pub(crate) fn check_ast(
         cell_offsets,
         notebook_index,
         target_version,
-        context,
     );
     checker.bind_builtins();
 
@@ -3096,137 +3013,10 @@ pub(crate) fn check_ast(
     analyze::deferred_scopes(&checker);
 
     let Checker {
-        semantic_errors, ..
+        diagnostics,
+        semantic_errors,
+        ..
     } = checker;
 
-    semantic_errors.into_inner()
-}
-
-/// A type for collecting diagnostics in a given file.
-///
-/// [`LintContext::report_diagnostic`] can be used to obtain a [`DiagnosticGuard`], which will push
-/// a [`Violation`] to the contained [`OldDiagnostic`] collection on `Drop`.
-pub(crate) struct LintContext<'a> {
-    diagnostics: RefCell<Vec<OldDiagnostic>>,
-    source_file: &'a SourceFile,
-}
-
-impl<'a> LintContext<'a> {
-    /// Create a new collector with the given `source_file` and an empty collection of
-    /// `OldDiagnostic`s.
-    pub(crate) fn new(source_file: &'a SourceFile) -> Self {
-        Self {
-            diagnostics: RefCell::default(),
-            source_file,
-        }
-    }
-
-    /// Return a [`DiagnosticGuard`] for reporting a diagnostic.
-    ///
-    /// The guard derefs to an [`OldDiagnostic`], so it can be used to further modify the diagnostic
-    /// before it is added to the collection in the collector on `Drop`.
-    pub(crate) fn report_diagnostic<'chk, T: Violation>(
-        &'chk self,
-        kind: T,
-        range: TextRange,
-    ) -> DiagnosticGuard<'chk, 'a> {
-        DiagnosticGuard {
-            context: self,
-            diagnostic: Some(OldDiagnostic::new(kind, range, self.source_file)),
-        }
-    }
-
-    /// Return a [`DiagnosticGuard`] for reporting a diagnostic if the corresponding rule is
-    /// enabled.
-    ///
-    /// Prefer [`DiagnosticsCollector::report_diagnostic`] in general because the conversion from an
-    /// `OldDiagnostic` to a `Rule` is somewhat expensive.
-    pub(crate) fn report_diagnostic_if_enabled<'chk, T: Violation>(
-        &'chk self,
-        kind: T,
-        range: TextRange,
-        settings: &LinterSettings,
-    ) -> Option<DiagnosticGuard<'chk, 'a>> {
-        let diagnostic = OldDiagnostic::new(kind, range, self.source_file);
-        if settings.rules.enabled(diagnostic.rule()) {
-            Some(DiagnosticGuard {
-                context: self,
-                diagnostic: Some(diagnostic),
-            })
-        } else {
-            None
-        }
-    }
-
-    pub(crate) fn into_diagnostics(self) -> Vec<OldDiagnostic> {
-        self.diagnostics.into_inner()
-    }
-
-    pub(crate) fn is_empty(&self) -> bool {
-        self.diagnostics.borrow().is_empty()
-    }
-
-    pub(crate) fn as_mut_vec(&mut self) -> &mut Vec<OldDiagnostic> {
-        self.diagnostics.get_mut()
-    }
-
-    pub(crate) fn iter(&mut self) -> impl Iterator<Item = &OldDiagnostic> {
-        self.diagnostics.get_mut().iter()
-    }
-}
-
-/// An abstraction for mutating a diagnostic.
-///
-/// Callers can build this guard by starting with `Checker::report_diagnostic`.
-///
-/// The primary function of this guard is to add the underlying diagnostic to the `Checker`'s list
-/// of diagnostics on `Drop`, while dereferencing to the underlying diagnostic for mutations like
-/// adding fixes or parent ranges.
-pub(crate) struct DiagnosticGuard<'a, 'b> {
-    /// The parent checker that will receive the diagnostic on `Drop`.
-    context: &'a LintContext<'b>,
-    /// The diagnostic that we want to report.
-    ///
-    /// This is always `Some` until the `Drop` (or `defuse`) call.
-    diagnostic: Option<OldDiagnostic>,
-}
-
-impl DiagnosticGuard<'_, '_> {
-    /// Consume the underlying `Diagnostic` without emitting it.
-    ///
-    /// In general you should avoid constructing diagnostics that may not be emitted, but this
-    /// method can be used where this is unavoidable.
-    pub(crate) fn defuse(mut self) {
-        self.diagnostic = None;
-    }
-}
-
-impl std::ops::Deref for DiagnosticGuard<'_, '_> {
-    type Target = OldDiagnostic;
-
-    fn deref(&self) -> &OldDiagnostic {
-        // OK because `self.diagnostic` is only `None` within `Drop`.
-        self.diagnostic.as_ref().unwrap()
-    }
-}
-
-/// Return a mutable borrow of the diagnostic in this guard.
-impl std::ops::DerefMut for DiagnosticGuard<'_, '_> {
-    fn deref_mut(&mut self) -> &mut OldDiagnostic {
-        // OK because `self.diagnostic` is only `None` within `Drop`.
-        self.diagnostic.as_mut().unwrap()
-    }
-}
-
-impl Drop for DiagnosticGuard<'_, '_> {
-    fn drop(&mut self) {
-        if std::thread::panicking() {
-            // Don't submit diagnostics when panicking because they might be incomplete.
-            return;
-        }
-
-        if let Some(diagnostic) = self.diagnostic.take() {
-            self.context.diagnostics.borrow_mut().push(diagnostic);
-        }
-    }
+    (diagnostics.into_inner(), semantic_errors.into_inner())
 }