WIP: Rename rule selector from nursery to preview

.editorconfig

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

.github/dependabot.yml

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

.github/release.yml

@@ -20,9 +20,6 @@ changelog:
     - title: Bug Fixes
       labels:
         - bug
-    - title: Preview
-      labels:
-        - preview
     - title: Other Changes
       labels:
         - "*"

.github/workflows/ci.yaml

@@ -26,11 +26,11 @@ jobs:
       linter: ${{ steps.changed.outputs.linter_any_changed }}
       formatter: ${{ steps.changed.outputs.formatter_any_changed }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - uses: tj-actions/changed-files@v39
+      - uses: tj-actions/changed-files@v38
         id: changed
         with:
           files_yaml: |
@@ -62,7 +62,7 @@ jobs:
     name: "cargo fmt"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup component add rustfmt
       - run: cargo fmt --all --check
@@ -71,7 +71,7 @@ jobs:
     name: "cargo clippy"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: |
           rustup component add clippy
@@ -89,7 +89,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     name: "cargo test | ${{ matrix.os }}"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Install cargo insta"
@@ -125,7 +125,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "cargo fuzz"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - uses: Swatinem/rust-cache@v2
@@ -141,7 +141,7 @@ jobs:
     runs-on: ubuntu-latest
     name: "cargo test (wasm)"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup target add wasm32-unknown-unknown
       - uses: actions/setup-node@v3
@@ -160,7 +160,7 @@ jobs:
     name: "test scripts"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup component add rustfmt
       - uses: Swatinem/rust-cache@v2
@@ -182,7 +182,7 @@ jobs:
     # Only runs on pull requests, since that is the only we way we can find the base version for comparison.
     if: github.event_name == 'pull_request' && needs.determine_changes.outputs.linter == 'true'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -227,7 +227,7 @@ jobs:
     name: "cargo udeps"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install nightly Rust toolchain"
         # Only pinned to make caching work, update freely
         run: rustup toolchain install nightly-2023-06-08
@@ -241,7 +241,7 @@ jobs:
     name: "python package"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -265,7 +265,7 @@ jobs:
     name: "pre-commit"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
@@ -295,7 +295,7 @@ jobs:
     env:
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
@@ -330,7 +330,7 @@ jobs:
     needs: determine_changes
     if: needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
         run: rustup show
       - name: "Cache rust"
@@ -346,7 +346,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout Branch"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: "Install Rust toolchain"
         run: rustup show

.github/workflows/docs.yaml

@@ -2,11 +2,6 @@ name: mkdocs
 
 on:
   workflow_dispatch:
-    inputs:
-      ref:
-        description: "The commit SHA, tag, or branch to publish. Uses the default branch if not specified."
-        default: ""
-        type: string
   release:
     types: [published]
 
@@ -17,9 +12,7 @@ jobs:
       CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
       MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.ref }}
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
       - name: "Add SSH key"
         if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
@@ -47,9 +40,8 @@ jobs:
         run: mkdocs build --strict -f mkdocs.generated.yml
       - name: "Deploy to Cloudflare Pages"
         if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@v3.1.1
+        uses: cloudflare/wrangler-action@v3.1.0
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}
-          # `github.head_ref` is only set during pull requests and for manual runs or tags we use `main` to deploy to production
-          command: pages deploy site --project-name=ruff-docs --branch ${{ github.head_ref || 'main' }} --commit-hash ${GITHUB_SHA}
+          command: pages publish site --project-name=ruff-docs --branch ${GITHUB_HEAD_REF} --commit-hash ${GITHUB_SHA}

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

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

.github/workflows/playground.yaml

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

.github/workflows/release.yaml

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

.pre-commit-config.yaml

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

BREAKING_CHANGES.md

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

CONTRIBUTING.md

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

Cargo.toml

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

README.md

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

crates/flake8_to_ruff/Cargo.toml

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

crates/flake8_to_ruff/src/plugin.rs

@@ -4,7 +4,6 @@ use std::str::FromStr;
 
 use anyhow::anyhow;
 use ruff::registry::Linter;
-use ruff::settings::types::PreviewMode;
 use ruff::RuleSelector;
 
 #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq)]
@@ -332,7 +331,7 @@ pub(crate) fn infer_plugins_from_codes(selectors: &HashSet<RuleSelector>) -> Vec
     .filter(|plugin| {
         for selector in selectors {
             if selector
-                .rules(PreviewMode::Disabled)
+                .into_iter()
                 .any(|rule| Linter::from(plugin).rules().any(|r| r == rule))
             {
                 return true;

crates/ruff/Cargo.toml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,3 @@
-from typing import override
-
-
 class Apples:
     def _init_(self):  # [bad-dunder-name]
         pass
@@ -24,11 +21,6 @@ class Apples:
         # author likely meant to call the invert dunder method
         pass
 
-    @override
-    def _ignore__(self):  # [bad-dunder-name]
-        # overridden dunder methods should be ignored
-        pass
-
     def hello(self):
         print("hello")
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -178,9 +178,3 @@ if True:
 if True:
     if sys.version_info > (3, 0): \
     expected_error = []
-
-if sys.version_info < (3,12):
-    print("py3")
-
-if sys.version_info <= (3,12):
-    print("py3")

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

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

crates/ruff/src/autofix/edits.rs

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

crates/ruff/src/autofix/mod.rs

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

crates/ruff/src/autofix/source_map.rs

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

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

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

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

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

crates/ruff/src/checkers/imports.rs

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

crates/ruff/src/codes.rs

@@ -9,7 +9,6 @@ use strum_macros::{AsRefStr, EnumIter};
 use ruff_diagnostics::Violation;
 
 use crate::registry::{AsRule, Linter};
-use crate::rule_selector::is_single_rule_selector;
 use crate::rules;
 
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
@@ -52,11 +51,8 @@ impl PartialEq<&str> for NoqaCode {
 pub enum RuleGroup {
     /// The rule has not been assigned to any specific group.
     Unspecified,
-    /// The rule is unstable, and preview mode must be enabled for usage.
+    /// The rule is unstable, and must be enabled explicitly or by enabling preview.
     Preview,
-    /// Legacy category for unstable rules, supports backwards compatible selection.
-    #[deprecated(note = "Use `RuleGroup::Preview` for new rules instead")]
-    Nursery,
 }
 
 #[ruff_macros::map_codes]
@@ -68,72 +64,39 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
     Some(match (linter, code) {
         // pycodestyle errors
         (Pycodestyle, "E101") => (RuleGroup::Unspecified, rules::pycodestyle::rules::MixedSpacesAndTabs),
-        #[allow(deprecated)]
-        (Pycodestyle, "E111") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::IndentationWithInvalidMultiple),
-        #[allow(deprecated)]
-        (Pycodestyle, "E112") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::NoIndentedBlock),
-        #[allow(deprecated)]
-        (Pycodestyle, "E113") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::UnexpectedIndentation),
-        #[allow(deprecated)]
-        (Pycodestyle, "E114") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::IndentationWithInvalidMultipleComment),
-        #[allow(deprecated)]
-        (Pycodestyle, "E115") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::NoIndentedBlockComment),
-        #[allow(deprecated)]
-        (Pycodestyle, "E116") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::UnexpectedIndentationComment),
-        #[allow(deprecated)]
-        (Pycodestyle, "E117") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::OverIndented),
-        #[allow(deprecated)]
-        (Pycodestyle, "E201") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::WhitespaceAfterOpenBracket),
-        #[allow(deprecated)]
-        (Pycodestyle, "E202") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::WhitespaceBeforeCloseBracket),
-        #[allow(deprecated)]
-        (Pycodestyle, "E203") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::WhitespaceBeforePunctuation),
-        #[allow(deprecated)]
-        (Pycodestyle, "E211") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::WhitespaceBeforeParameters),
-        #[allow(deprecated)]
-        (Pycodestyle, "E221") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleSpacesBeforeOperator),
-        #[allow(deprecated)]
-        (Pycodestyle, "E222") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterOperator),
-        #[allow(deprecated)]
-        (Pycodestyle, "E223") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabBeforeOperator),
-        #[allow(deprecated)]
-        (Pycodestyle, "E224") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabAfterOperator),
-        #[allow(deprecated)]
-        (Pycodestyle, "E225") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundOperator),
-        #[allow(deprecated)]
-        (Pycodestyle, "E226") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundArithmeticOperator),
-        #[allow(deprecated)]
-        (Pycodestyle, "E227") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundBitwiseOrShiftOperator),
-        #[allow(deprecated)]
-        (Pycodestyle, "E228") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundModuloOperator),
-        #[allow(deprecated)]
-        (Pycodestyle, "E231") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespace),
-        #[allow(deprecated)]
-        (Pycodestyle, "E241") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterComma),
-        #[allow(deprecated)]
-        (Pycodestyle, "E242") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabAfterComma),
-        #[allow(deprecated)]
-        (Pycodestyle, "E251") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::UnexpectedSpacesAroundKeywordParameterEquals),
-        #[allow(deprecated)]
-        (Pycodestyle, "E252") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundParameterEquals),
-        #[allow(deprecated)]
-        (Pycodestyle, "E261") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TooFewSpacesBeforeInlineComment),
-        #[allow(deprecated)]
-        (Pycodestyle, "E262") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::NoSpaceAfterInlineComment),
-        #[allow(deprecated)]
-        (Pycodestyle, "E265") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::NoSpaceAfterBlockComment),
-        #[allow(deprecated)]
-        (Pycodestyle, "E266") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleLeadingHashesForBlockComment),
-        #[allow(deprecated)]
-        (Pycodestyle, "E271") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterKeyword),
-        #[allow(deprecated)]
-        (Pycodestyle, "E272") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MultipleSpacesBeforeKeyword),
-        #[allow(deprecated)]
-        (Pycodestyle, "E273") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabAfterKeyword),
-        #[allow(deprecated)]
-        (Pycodestyle, "E274") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabBeforeKeyword),
-        #[allow(deprecated)]
-        (Pycodestyle, "E275") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAfterKeyword),
+        (Pycodestyle, "E111") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::IndentationWithInvalidMultiple),
+        (Pycodestyle, "E112") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::NoIndentedBlock),
+        (Pycodestyle, "E113") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::UnexpectedIndentation),
+        (Pycodestyle, "E114") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::IndentationWithInvalidMultipleComment),
+        (Pycodestyle, "E115") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::NoIndentedBlockComment),
+        (Pycodestyle, "E116") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::UnexpectedIndentationComment),
+        (Pycodestyle, "E117") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::OverIndented),
+        (Pycodestyle, "E201") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::WhitespaceAfterOpenBracket),
+        (Pycodestyle, "E202") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::WhitespaceBeforeCloseBracket),
+        (Pycodestyle, "E203") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::WhitespaceBeforePunctuation),
+        (Pycodestyle, "E211") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::WhitespaceBeforeParameters),
+        (Pycodestyle, "E221") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MultipleSpacesBeforeOperator),
+        (Pycodestyle, "E222") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterOperator),
+        (Pycodestyle, "E223") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::TabBeforeOperator),
+        (Pycodestyle, "E224") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::TabAfterOperator),
+        (Pycodestyle, "E225") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundOperator),
+        (Pycodestyle, "E226") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundArithmeticOperator),
+        (Pycodestyle, "E227") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundBitwiseOrShiftOperator),
+        (Pycodestyle, "E228") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundModuloOperator),
+        (Pycodestyle, "E231") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MissingWhitespace),
+        (Pycodestyle, "E241") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterComma),
+        (Pycodestyle, "E242") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::TabAfterComma),
+        (Pycodestyle, "E251") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::UnexpectedSpacesAroundKeywordParameterEquals),
+        (Pycodestyle, "E252") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAroundParameterEquals),
+        (Pycodestyle, "E261") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::TooFewSpacesBeforeInlineComment),
+        (Pycodestyle, "E262") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::NoSpaceAfterInlineComment),
+        (Pycodestyle, "E265") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::NoSpaceAfterBlockComment),
+        (Pycodestyle, "E266") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MultipleLeadingHashesForBlockComment),
+        (Pycodestyle, "E271") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MultipleSpacesAfterKeyword),
+        (Pycodestyle, "E272") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MultipleSpacesBeforeKeyword),
+        (Pycodestyle, "E273") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::TabAfterKeyword),
+        (Pycodestyle, "E274") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::TabBeforeKeyword),
+        (Pycodestyle, "E275") => (RuleGroup::Preview, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAfterKeyword),
         (Pycodestyle, "E401") => (RuleGroup::Unspecified, rules::pycodestyle::rules::MultipleImportsOnOneLine),
         (Pycodestyle, "E402") => (RuleGroup::Unspecified, rules::pycodestyle::rules::ModuleImportNotAtTopOfFile),
         (Pycodestyle, "E501") => (RuleGroup::Unspecified, rules::pycodestyle::rules::LineTooLong),
@@ -213,8 +176,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pylint, "C0205") => (RuleGroup::Unspecified, rules::pylint::rules::SingleStringSlots),
         (Pylint, "C0208") => (RuleGroup::Unspecified, rules::pylint::rules::IterationOverSet),
         (Pylint, "C0414") => (RuleGroup::Unspecified, rules::pylint::rules::UselessImportAlias),
-        #[allow(deprecated)]
-        (Pylint, "C1901") => (RuleGroup::Nursery, rules::pylint::rules::CompareToEmptyString),
+        (Pylint, "C1901") => (RuleGroup::Preview, rules::pylint::rules::CompareToEmptyString),
         (Pylint, "C3002") => (RuleGroup::Unspecified, rules::pylint::rules::UnnecessaryDirectLambdaCall),
         (Pylint, "E0100") => (RuleGroup::Unspecified, rules::pylint::rules::YieldInInit),
         (Pylint, "E0101") => (RuleGroup::Unspecified, rules::pylint::rules::ReturnInInit),
@@ -250,12 +212,11 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pylint, "R0915") => (RuleGroup::Unspecified, rules::pylint::rules::TooManyStatements),
         (Pylint, "R1701") => (RuleGroup::Unspecified, rules::pylint::rules::RepeatedIsinstanceCalls),
         (Pylint, "R1711") => (RuleGroup::Unspecified, rules::pylint::rules::UselessReturn),
-        (Pylint, "R1714") => (RuleGroup::Unspecified, rules::pylint::rules::RepeatedEqualityComparison),
+        (Pylint, "R1714") => (RuleGroup::Unspecified, rules::pylint::rules::RepeatedEqualityComparisonTarget),
         (Pylint, "R1722") => (RuleGroup::Unspecified, rules::pylint::rules::SysExitAlias),
         (Pylint, "R2004") => (RuleGroup::Unspecified, rules::pylint::rules::MagicValueComparison),
         (Pylint, "R5501") => (RuleGroup::Unspecified, rules::pylint::rules::CollapsibleElseIf),
-        #[allow(deprecated)]
-        (Pylint, "R6301") => (RuleGroup::Nursery, rules::pylint::rules::NoSelfUse),
+        (Pylint, "R6301") => (RuleGroup::Preview, rules::pylint::rules::NoSelfUse),
         (Pylint, "W0120") => (RuleGroup::Unspecified, rules::pylint::rules::UselessElseOnLoop),
         (Pylint, "W0127") => (RuleGroup::Unspecified, rules::pylint::rules::SelfAssigningVariable),
         (Pylint, "W0129") => (RuleGroup::Unspecified, rules::pylint::rules::AssertOnStringLiteral),
@@ -267,11 +228,9 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pylint, "W1508") => (RuleGroup::Unspecified, rules::pylint::rules::InvalidEnvvarDefault),
         (Pylint, "W1509") => (RuleGroup::Unspecified, rules::pylint::rules::SubprocessPopenPreexecFn),
         (Pylint, "W1510") => (RuleGroup::Unspecified, rules::pylint::rules::SubprocessRunWithoutCheck),
-        #[allow(deprecated)]
-        (Pylint, "W1641") => (RuleGroup::Nursery, rules::pylint::rules::EqWithoutHash),
+        (Pylint, "W1641") => (RuleGroup::Preview, rules::pylint::rules::EqWithoutHash),
         (Pylint, "W2901") => (RuleGroup::Unspecified, rules::pylint::rules::RedefinedLoopName),
-        #[allow(deprecated)]
-        (Pylint, "W3201") => (RuleGroup::Nursery, rules::pylint::rules::BadDunderMethodName),
+        (Pylint, "W3201") => (RuleGroup::Preview, rules::pylint::rules::BadDunderMethodName),
         (Pylint, "W3301") => (RuleGroup::Unspecified, rules::pylint::rules::NestedMinMax),
 
         // flake8-async
@@ -444,8 +403,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Simplify, "910") => (RuleGroup::Unspecified, rules::flake8_simplify::rules::DictGetWithNoneDefault),
 
         // flake8-copyright
-        #[allow(deprecated)]
-        (Flake8Copyright, "001") => (RuleGroup::Nursery, rules::flake8_copyright::rules::MissingCopyrightNotice),
+        (Flake8Copyright, "001") => (RuleGroup::Preview, rules::flake8_copyright::rules::MissingCopyrightNotice),
 
         // pyupgrade
         (Pyupgrade, "001") => (RuleGroup::Unspecified, rules::pyupgrade::rules::UselessMetaclassType),
@@ -857,12 +815,10 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Ruff, "012") => (RuleGroup::Unspecified, rules::ruff::rules::MutableClassDefault),
         (Ruff, "013") => (RuleGroup::Unspecified, rules::ruff::rules::ImplicitOptional),
         #[cfg(feature = "unreachable-code")] // When removing this feature gate, also update rules_selector.rs
-        #[allow(deprecated)]
-        (Ruff, "014") => (RuleGroup::Nursery, rules::ruff::rules::UnreachableCode),
+        (Ruff, "014") => (RuleGroup::Preview, rules::ruff::rules::UnreachableCode),
         (Ruff, "015") => (RuleGroup::Unspecified, rules::ruff::rules::UnnecessaryIterableAllocationForFirstElement),
         (Ruff, "016") => (RuleGroup::Unspecified, rules::ruff::rules::InvalidIndexType),
-        #[allow(deprecated)]
-        (Ruff, "017") => (RuleGroup::Nursery, rules::ruff::rules::QuadraticListSummation),
+        (Ruff, "017") => (RuleGroup::Preview, rules::ruff::rules::QuadraticListSummation),
         (Ruff, "100") => (RuleGroup::Unspecified, rules::ruff::rules::UnusedNOQA),
         (Ruff, "200") => (RuleGroup::Unspecified, rules::ruff::rules::InvalidPyprojectToml),
 
@@ -910,12 +866,9 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Flake8Slots, "002") => (RuleGroup::Unspecified, rules::flake8_slots::rules::NoSlotsInNamedtupleSubclass),
 
         // refurb
-        #[allow(deprecated)]
-        (Refurb, "113") => (RuleGroup::Nursery, rules::refurb::rules::RepeatedAppend),
-        #[allow(deprecated)]
-        (Refurb, "131") => (RuleGroup::Nursery, rules::refurb::rules::DeleteFullSlice),
-        #[allow(deprecated)]
-        (Refurb, "132") => (RuleGroup::Nursery, rules::refurb::rules::CheckAndRemoveFromSet),
+        (Refurb, "113") => (RuleGroup::Preview, rules::refurb::rules::RepeatedAppend),
+        (Refurb, "131") => (RuleGroup::Preview, rules::refurb::rules::DeleteFullSlice),
+        (Refurb, "132") => (RuleGroup::Preview, rules::refurb::rules::CheckAndRemoveFromSet),
 
         _ => return None,
     })

crates/ruff/src/cst/helpers.rs

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

crates/ruff/src/importer/mod.rs

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

crates/ruff/src/jupyter/index.rs

@@ -1,10 +1,8 @@
-use serde::{Deserialize, Serialize};
-
 /// Jupyter Notebook indexing table
 ///
 /// When we lint a jupyter notebook, we have to translate the row/column based on
 /// [`ruff_text_size::TextSize`] to jupyter notebook cell/row/column.
-#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct NotebookIndex {
     /// Enter a row (1-based), get back the cell (1-based)
     pub(super) row_to_cell: Vec<u32>,

crates/ruff/src/jupyter/notebook.rs

@@ -1,23 +1,29 @@
 use std::cmp::Ordering;
 use std::fmt::Display;
 use std::fs::File;
-use std::io::{BufReader, Cursor, Read, Seek, SeekFrom, Write};
+use std::io::{BufReader, BufWriter, Cursor, Read, Seek, SeekFrom, Write};
+use std::iter;
 use std::path::Path;
-use std::{io, iter};
 
 use itertools::Itertools;
 use once_cell::sync::OnceCell;
 use serde::Serialize;
 use serde_json::error::Category;
-use thiserror::Error;
 use uuid::Uuid;
 
-use ruff_diagnostics::{SourceMap, SourceMarker};
+use ruff_diagnostics::Diagnostic;
+use ruff_python_parser::lexer::lex;
+use ruff_python_parser::Mode;
 use ruff_source_file::{NewlineWithTrailingNewline, UniversalNewlineIterator};
-use ruff_text_size::TextSize;
+use ruff_text_size::{TextRange, TextSize};
 
-use crate::index::NotebookIndex;
-use crate::schema::{Cell, RawNotebook, SortAlphabetically, SourceValue};
+use crate::autofix::source_map::{SourceMap, SourceMarker};
+use crate::jupyter::index::NotebookIndex;
+use crate::jupyter::schema::{Cell, RawNotebook, SortAlphabetically, SourceValue};
+use crate::rules::pycodestyle::rules::SyntaxError;
+use crate::IOError;
+
+pub const JUPYTER_NOTEBOOK_EXT: &str = "ipynb";
 
 /// Run round-trip source code generation on a given Jupyter notebook file path.
 pub fn round_trip(path: &Path) -> anyhow::Result<String> {
@@ -31,7 +37,7 @@ pub fn round_trip(path: &Path) -> anyhow::Result<String> {
     let code = notebook.source_code().to_string();
     notebook.update_cell_content(&code);
     let mut writer = Vec::new();
-    notebook.write(&mut writer)?;
+    notebook.write_inner(&mut writer)?;
     Ok(String::from_utf8(writer)?)
 }
 
@@ -90,21 +96,6 @@ impl Cell {
     }
 }
 
-/// An error that can occur while deserializing a Jupyter Notebook.
-#[derive(Error, Debug)]
-pub enum NotebookError {
-    #[error(transparent)]
-    Io(#[from] io::Error),
-    #[error(transparent)]
-    Json(serde_json::Error),
-    #[error("Expected a Jupyter Notebook, which must be internally stored as JSON, but this file isn't valid JSON: {0}")]
-    InvalidJson(serde_json::Error),
-    #[error("This file does not match the schema expected of Jupyter Notebooks: {0}")]
-    InvalidSchema(serde_json::Error),
-    #[error("Expected Jupyter Notebook format 4, found: {0}")]
-    InvalidFormat(i64),
-}
-
 #[derive(Clone, Debug, PartialEq)]
 pub struct Notebook {
     /// Python source code of the notebook.
@@ -130,12 +121,19 @@ pub struct Notebook {
 
 impl Notebook {
     /// Read the Jupyter Notebook from the given [`Path`].
-    pub fn from_path(path: &Path) -> Result<Self, NotebookError> {
-        Self::from_reader(BufReader::new(File::open(path)?))
+    pub fn from_path(path: &Path) -> Result<Self, Box<Diagnostic>> {
+        Self::from_reader(BufReader::new(File::open(path).map_err(|err| {
+            Diagnostic::new(
+                IOError {
+                    message: format!("{err}"),
+                },
+                TextRange::default(),
+            )
+        })?))
     }
 
     /// Read the Jupyter Notebook from its JSON string.
-    pub fn from_source_code(source_code: &str) -> Result<Self, NotebookError> {
+    pub fn from_source_code(source_code: &str) -> Result<Self, Box<Diagnostic>> {
         Self::from_reader(Cursor::new(source_code))
     }
 
@@ -143,7 +141,7 @@ impl Notebook {
     ///
     /// See also the black implementation
     /// <https://github.com/psf/black/blob/69ca0a4c7a365c5f5eea519a90980bab72cab764/src/black/__init__.py#L1017-L1046>
-    fn from_reader<R>(mut reader: R) -> Result<Self, NotebookError>
+    fn from_reader<R>(mut reader: R) -> Result<Self, Box<Diagnostic>>
     where
         R: Read + Seek,
     {
@@ -151,27 +149,95 @@ impl Notebook {
             let mut buf = [0; 1];
             reader.read_exact(&mut buf).is_ok_and(|_| buf[0] == b'\n')
         });
-        reader.rewind()?;
+        reader.rewind().map_err(|err| {
+            Diagnostic::new(
+                IOError {
+                    message: format!("{err}"),
+                },
+                TextRange::default(),
+            )
+        })?;
         let mut raw_notebook: RawNotebook = match serde_json::from_reader(reader.by_ref()) {
             Ok(notebook) => notebook,
             Err(err) => {
                 // Translate the error into a diagnostic
-                return Err(match err.classify() {
-                    Category::Io => NotebookError::Json(err),
-                    Category::Syntax | Category::Eof => NotebookError::InvalidJson(err),
-                    Category::Data => {
-                        // We could try to read the schema version here but if this fails it's
-                        // a bug anyway.
-                        NotebookError::InvalidSchema(err)
+                return Err(Box::new({
+                    match err.classify() {
+                        Category::Io => Diagnostic::new(
+                            IOError {
+                                message: format!("{err}"),
+                            },
+                            TextRange::default(),
+                        ),
+                        Category::Syntax | Category::Eof => {
+                            // Maybe someone saved the python sources (those with the `# %%` separator)
+                            // as jupyter notebook instead. Let's help them.
+                            let mut contents = String::new();
+                            reader
+                                .rewind()
+                                .and_then(|_| reader.read_to_string(&mut contents))
+                                .map_err(|err| {
+                                    Diagnostic::new(
+                                        IOError {
+                                            message: format!("{err}"),
+                                        },
+                                        TextRange::default(),
+                                    )
+                                })?;
+
+                            // Check if tokenizing was successful and the file is non-empty
+                            if lex(&contents, Mode::Module).any(|result| result.is_err()) {
+                                Diagnostic::new(
+                                    SyntaxError {
+                                        message: format!(
+                                            "A Jupyter Notebook (.{JUPYTER_NOTEBOOK_EXT}) must internally be JSON, \
+                                but this file isn't valid JSON: {err}"
+                                        ),
+                                    },
+                                    TextRange::default(),
+                                )
+                            } else {
+                                Diagnostic::new(
+                                    SyntaxError {
+                                        message: format!(
+                                            "Expected a Jupyter Notebook (.{JUPYTER_NOTEBOOK_EXT}), \
+                                    which must be internally stored as JSON, \
+                                    but found a Python source file: {err}"
+                                        ),
+                                    },
+                                    TextRange::default(),
+                                )
+                            }
+                        }
+                        Category::Data => {
+                            // We could try to read the schema version here but if this fails it's
+                            // a bug anyway
+                            Diagnostic::new(
+                                SyntaxError {
+                                    message: format!(
+                                        "This file does not match the schema expected of Jupyter Notebooks: {err}"
+                                    ),
+                                },
+                                TextRange::default(),
+                            )
+                        }
                     }
-                });
+                }));
             }
         };
 
         // v4 is what everybody uses
         if raw_notebook.nbformat != 4 {
             // bail because we should have already failed at the json schema stage
-            return Err(NotebookError::InvalidFormat(raw_notebook.nbformat));
+            return Err(Box::new(Diagnostic::new(
+                SyntaxError {
+                    message: format!(
+                        "Expected Jupyter Notebook format 4, found {}",
+                        raw_notebook.nbformat
+                    ),
+                },
+                TextRange::default(),
+            )));
         }
 
         let valid_code_cells = raw_notebook
@@ -238,13 +304,13 @@ impl Notebook {
         // The first offset is always going to be at 0, so skip it.
         for offset in self.cell_offsets.iter_mut().skip(1).rev() {
             let closest_marker = match last_marker {
-                Some(marker) if marker.source() <= *offset => marker,
+                Some(marker) if marker.source <= *offset => marker,
                 _ => {
                     let Some(marker) = source_map
                         .markers()
                         .iter()
                         .rev()
-                        .find(|marker| marker.source() <= *offset)
+                        .find(|m| m.source <= *offset)
                     else {
                         // There are no markers above the current offset, so we can
                         // stop here.
@@ -255,9 +321,9 @@ impl Notebook {
                 }
             };
 
-            match closest_marker.source().cmp(&closest_marker.dest()) {
-                Ordering::Less => *offset += closest_marker.dest() - closest_marker.source(),
-                Ordering::Greater => *offset -= closest_marker.source() - closest_marker.dest(),
+            match closest_marker.source.cmp(&closest_marker.dest) {
+                Ordering::Less => *offset += closest_marker.dest - closest_marker.source,
+                Ordering::Greater => *offset -= closest_marker.source - closest_marker.dest,
                 Ordering::Equal => (),
             }
         }
@@ -365,23 +431,18 @@ impl Notebook {
     /// The index is built only once when required. This is only used to
     /// report diagnostics, so by that time all of the autofixes must have
     /// been applied if `--fix` was passed.
-    pub fn index(&self) -> &NotebookIndex {
+    pub(crate) fn index(&self) -> &NotebookIndex {
         self.index.get_or_init(|| self.build_index())
     }
 
     /// Return the cell offsets for the concatenated source code corresponding
     /// the Jupyter notebook.
-    pub fn cell_offsets(&self) -> &[TextSize] {
+    pub(crate) fn cell_offsets(&self) -> &[TextSize] {
         &self.cell_offsets
     }
 
-    /// Return `true` if the notebook has a trailing newline, `false` otherwise.
-    pub fn trailing_newline(&self) -> bool {
-        self.trailing_newline
-    }
-
     /// Update the notebook with the given sourcemap and transformed content.
-    pub fn update(&mut self, source_map: &SourceMap, transformed: String) {
+    pub(crate) fn update(&mut self, source_map: &SourceMap, transformed: String) {
         // Cell offsets must be updated before updating the cell content as
         // it depends on the offsets to extract the cell content.
         self.index.take();
@@ -404,8 +465,7 @@ impl Notebook {
             .map_or(true, |language| language.name == "python")
     }
 
-    /// Write the notebook back to the given [`Write`] implementor.
-    pub fn write(&self, writer: &mut dyn Write) -> anyhow::Result<()> {
+    fn write_inner(&self, writer: &mut impl Write) -> anyhow::Result<()> {
         // https://github.com/psf/black/blob/69ca0a4c7a365c5f5eea519a90980bab72cab764/src/black/__init__.py#LL1041
         let formatter = serde_json::ser::PrettyFormatter::with_indent(b" ");
         let mut serializer = serde_json::Serializer::with_formatter(writer, formatter);
@@ -415,6 +475,13 @@ impl Notebook {
         }
         Ok(())
     }
+
+    /// Write back with an indent of 1, just like black
+    pub fn write(&self, path: &Path) -> anyhow::Result<()> {
+        let mut writer = BufWriter::new(File::create(path)?);
+        self.write_inner(&mut writer)?;
+        Ok(())
+    }
 }
 
 #[cfg(test)]
@@ -424,41 +491,58 @@ mod tests {
     use anyhow::Result;
     use test_case::test_case;
 
-    use crate::{Cell, Notebook, NotebookError, NotebookIndex};
+    use crate::jupyter::index::NotebookIndex;
+    use crate::jupyter::schema::Cell;
+    use crate::jupyter::Notebook;
+    use crate::registry::Rule;
+    use crate::source_kind::SourceKind;
+    use crate::test::{
+        read_jupyter_notebook, test_contents, test_notebook_path, test_resource_path,
+        TestedNotebook,
+    };
+    use crate::{assert_messages, settings};
 
-    /// Construct a path to a Jupyter notebook in the `resources/test/fixtures/jupyter` directory.
-    fn notebook_path(path: impl AsRef<Path>) -> std::path::PathBuf {
-        Path::new("./resources/test/fixtures/jupyter").join(path)
+    /// Read a Jupyter cell from the `resources/test/fixtures/jupyter/cell` directory.
+    fn read_jupyter_cell(path: impl AsRef<Path>) -> Result<Cell> {
+        let path = test_resource_path("fixtures/jupyter/cell").join(path);
+        let source_code = std::fs::read_to_string(path)?;
+        Ok(serde_json::from_str(&source_code)?)
     }
 
     #[test]
-    fn test_python() -> Result<(), NotebookError> {
-        let notebook = Notebook::from_path(&notebook_path("valid.ipynb"))?;
-        assert!(notebook.is_python_notebook());
-        Ok(())
+    fn test_valid() {
+        assert!(read_jupyter_notebook(Path::new("valid.ipynb")).is_ok());
     }
 
     #[test]
-    fn test_r() -> Result<(), NotebookError> {
-        let notebook = Notebook::from_path(&notebook_path("R.ipynb"))?;
-        assert!(!notebook.is_python_notebook());
-        Ok(())
+    fn test_r() {
+        // We can load this, it will be filtered out later
+        assert!(read_jupyter_notebook(Path::new("R.ipynb")).is_ok());
     }
 
     #[test]
     fn test_invalid() {
-        assert!(matches!(
-            Notebook::from_path(&notebook_path("invalid_extension.ipynb")),
-            Err(NotebookError::InvalidJson(_))
-        ));
-        assert!(matches!(
-            Notebook::from_path(&notebook_path("not_json.ipynb")),
-            Err(NotebookError::InvalidJson(_))
-        ));
-        assert!(matches!(
-            Notebook::from_path(&notebook_path("wrong_schema.ipynb")),
-            Err(NotebookError::InvalidSchema(_))
-        ));
+        let path = Path::new("resources/test/fixtures/jupyter/invalid_extension.ipynb");
+        assert_eq!(
+            Notebook::from_path(path).unwrap_err().kind.body,
+            "SyntaxError: Expected a Jupyter Notebook (.ipynb), \
+            which must be internally stored as JSON, \
+            but found a Python source file: \
+            expected value at line 1 column 1"
+        );
+        let path = Path::new("resources/test/fixtures/jupyter/not_json.ipynb");
+        assert_eq!(
+            Notebook::from_path(path).unwrap_err().kind.body,
+            "SyntaxError: A Jupyter Notebook (.ipynb) must internally be JSON, \
+            but this file isn't valid JSON: \
+            expected value at line 1 column 1"
+        );
+        let path = Path::new("resources/test/fixtures/jupyter/wrong_schema.ipynb");
+        assert_eq!(
+            Notebook::from_path(path).unwrap_err().kind.body,
+            "SyntaxError: This file does not match the schema expected of Jupyter Notebooks: \
+            missing field `cells` at line 1 column 2"
+        );
     }
 
     #[test_case(Path::new("markdown.json"), false; "markdown")]
@@ -467,20 +551,13 @@ mod tests {
     #[test_case(Path::new("only_code.json"), true; "only_code")]
     #[test_case(Path::new("cell_magic.json"), false; "cell_magic")]
     fn test_is_valid_code_cell(path: &Path, expected: bool) -> Result<()> {
-        /// Read a Jupyter cell from the `resources/test/fixtures/jupyter/cell` directory.
-        fn read_jupyter_cell(path: impl AsRef<Path>) -> Result<Cell> {
-            let path = notebook_path("cell").join(path);
-            let source_code = std::fs::read_to_string(path)?;
-            Ok(serde_json::from_str(&source_code)?)
-        }
-
         assert_eq!(read_jupyter_cell(path)?.is_valid_code_cell(), expected);
         Ok(())
     }
 
     #[test]
-    fn test_concat_notebook() -> Result<(), NotebookError> {
-        let notebook = Notebook::from_path(&notebook_path("valid.ipynb"))?;
+    fn test_concat_notebook() -> Result<()> {
+        let notebook = read_jupyter_notebook(Path::new("valid.ipynb"))?;
         assert_eq!(
             notebook.source_code,
             r#"def unused_variable():
@@ -520,4 +597,110 @@ print("after empty cells")
         );
         Ok(())
     }
+
+    #[test]
+    fn test_import_sorting() -> Result<()> {
+        let path = "isort.ipynb".to_string();
+        let TestedNotebook {
+            messages,
+            source_notebook,
+            ..
+        } = test_notebook_path(
+            &path,
+            Path::new("isort_expected.ipynb"),
+            &settings::Settings::for_rule(Rule::UnsortedImports),
+        )?;
+        assert_messages!(messages, path, source_notebook);
+        Ok(())
+    }
+
+    #[test]
+    fn test_ipy_escape_command() -> Result<()> {
+        let path = "ipy_escape_command.ipynb".to_string();
+        let TestedNotebook {
+            messages,
+            source_notebook,
+            ..
+        } = test_notebook_path(
+            &path,
+            Path::new("ipy_escape_command_expected.ipynb"),
+            &settings::Settings::for_rule(Rule::UnusedImport),
+        )?;
+        assert_messages!(messages, path, source_notebook);
+        Ok(())
+    }
+
+    #[test]
+    fn test_unused_variable() -> Result<()> {
+        let path = "unused_variable.ipynb".to_string();
+        let TestedNotebook {
+            messages,
+            source_notebook,
+            ..
+        } = test_notebook_path(
+            &path,
+            Path::new("unused_variable_expected.ipynb"),
+            &settings::Settings::for_rule(Rule::UnusedVariable),
+        )?;
+        assert_messages!(messages, path, source_notebook);
+        Ok(())
+    }
+
+    #[test]
+    fn test_json_consistency() -> Result<()> {
+        let path = "before_fix.ipynb".to_string();
+        let TestedNotebook {
+            linted_notebook: fixed_notebook,
+            ..
+        } = test_notebook_path(
+            path,
+            Path::new("after_fix.ipynb"),
+            &settings::Settings::for_rule(Rule::UnusedImport),
+        )?;
+        let mut writer = Vec::new();
+        fixed_notebook.write_inner(&mut writer)?;
+        let actual = String::from_utf8(writer)?;
+        let expected =
+            std::fs::read_to_string(test_resource_path("fixtures/jupyter/after_fix.ipynb"))?;
+        assert_eq!(actual, expected);
+        Ok(())
+    }
+
+    #[test_case(Path::new("before_fix.ipynb"), true; "trailing_newline")]
+    #[test_case(Path::new("no_trailing_newline.ipynb"), false; "no_trailing_newline")]
+    fn test_trailing_newline(path: &Path, trailing_newline: bool) -> Result<()> {
+        let notebook = read_jupyter_notebook(path)?;
+        assert_eq!(notebook.trailing_newline, trailing_newline);
+
+        let mut writer = Vec::new();
+        notebook.write_inner(&mut writer)?;
+        let string = String::from_utf8(writer)?;
+        assert_eq!(string.ends_with('\n'), trailing_newline);
+
+        Ok(())
+    }
+
+    // Version <4.5, don't emit cell ids
+    #[test_case(Path::new("no_cell_id.ipynb"), false; "no_cell_id")]
+    // Version 4.5, cell ids are missing and need to be added
+    #[test_case(Path::new("add_missing_cell_id.ipynb"), true; "add_missing_cell_id")]
+    fn test_cell_id(path: &Path, has_id: bool) -> Result<()> {
+        let source_notebook = read_jupyter_notebook(path)?;
+        let source_kind = SourceKind::IpyNotebook(source_notebook);
+        let (_, transformed) = test_contents(
+            &source_kind,
+            path,
+            &settings::Settings::for_rule(Rule::UnusedImport),
+        );
+        let linted_notebook = transformed.into_owned().expect_ipy_notebook();
+        let mut writer = Vec::new();
+        linted_notebook.write_inner(&mut writer)?;
+        let actual = String::from_utf8(writer)?;
+        if has_id {
+            assert!(actual.contains(r#""id": ""#));
+        } else {
+            assert!(!actual.contains(r#""id":"#));
+        }
+        Ok(())
+    }
 }

crates/ruff/src/jupyter/schema.rs

@@ -46,7 +46,7 @@ fn sort_alphabetically<T: Serialize, S: serde::Serializer>(
 ///
 /// use serde::Serialize;
 ///
-/// use ruff_notebook::SortAlphabetically;
+/// use ruff::jupyter::SortAlphabetically;
 ///
 /// #[derive(Serialize)]
 /// struct MyStruct {

crates/ruff/src/jupyter/snapshots/ruff__jupyter__notebook__tests__import_sorting.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/src/linter.rs
+source: crates/ruff/src/jupyter/notebook.rs
 ---
 isort.ipynb:cell 1:1:1: I001 [*] Import block is un-sorted or un-formatted
   |

crates/ruff/src/jupyter/snapshots/ruff__jupyter__notebook__tests__ipy_escape_command.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/src/linter.rs
+source: crates/ruff/src/jupyter/notebook.rs
 ---
 ipy_escape_command.ipynb:cell 1:5:8: F401 [*] `os` imported but unused
   |

crates/ruff/src/jupyter/snapshots/ruff__jupyter__notebook__tests__unused_variable.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/ruff/src/linter.rs
+source: crates/ruff/src/jupyter/notebook.rs
 ---
 unused_variable.ipynb:cell 1:2:5: F841 [*] Local variable `foo1` is assigned to but never used
   |

crates/ruff/src/lib.rs

@@ -6,7 +6,7 @@
 //! [Ruff]: https://github.com/astral-sh/ruff
 
 pub use rule_selector::RuleSelector;
-pub use rules::pycodestyle::rules::{IOError, SyntaxError};
+pub use rules::pycodestyle::rules::IOError;
 
 pub const VERSION: &str = env!("CARGO_PKG_VERSION");
 
@@ -20,6 +20,7 @@ mod doc_lines;
 mod docstrings;
 pub mod fs;
 mod importer;
+pub mod jupyter;
 mod lex;
 pub mod line_width;
 pub mod linter;

crates/ruff/src/linter.rs

@@ -6,6 +6,8 @@ use anyhow::{anyhow, Result};
 use colored::Colorize;
 use itertools::Itertools;
 use log::error;
+use ruff_python_parser::lexer::LexResult;
+use ruff_python_parser::{AsMode, ParseError};
 use rustc_hash::FxHashMap;
 
 use ruff_diagnostics::Diagnostic;
@@ -13,8 +15,7 @@ use ruff_python_ast::imports::ImportMap;
 use ruff_python_ast::PySourceType;
 use ruff_python_codegen::Stylist;
 use ruff_python_index::Indexer;
-use ruff_python_parser::lexer::LexResult;
-use ruff_python_parser::{AsMode, ParseError};
+
 use ruff_source_file::{Locator, SourceFileBuilder};
 use ruff_text_size::Ranged;
 
@@ -81,7 +82,7 @@ pub fn check_path(
     directives: &Directives,
     settings: &Settings,
     noqa: flags::Noqa,
-    source_kind: &SourceKind,
+    source_kind: Option<&SourceKind>,
     source_type: PySourceType,
 ) -> LinterResult<(Vec<Diagnostic>, Option<ImportMap>)> {
     // Aggregate all diagnostics.
@@ -270,17 +271,17 @@ const MAX_ITERATIONS: usize = 100;
 pub fn add_noqa_to_path(
     path: &Path,
     package: Option<&Path>,
-    source_kind: &SourceKind,
     source_type: PySourceType,
     settings: &Settings,
 ) -> Result<usize> {
-    let contents = source_kind.source_code();
+    // Read the file from disk.
+    let contents = std::fs::read_to_string(path)?;
 
     // Tokenize once.
-    let tokens: Vec<LexResult> = ruff_python_parser::tokenize(contents, source_type.as_mode());
+    let tokens: Vec<LexResult> = ruff_python_parser::tokenize(&contents, source_type.as_mode());
 
     // Map row and column locations to byte slices (lazily).
-    let locator = Locator::new(contents);
+    let locator = Locator::new(&contents);
 
     // Detect the current code style (lazily).
     let stylist = Stylist::from_tokens(&tokens, &locator);
@@ -310,20 +311,21 @@ pub fn add_noqa_to_path(
         &directives,
         settings,
         flags::Noqa::Disabled,
-        source_kind,
+        None,
         source_type,
     );
 
     // Log any parse errors.
     if let Some(err) = error {
+        // TODO(dhruvmanila): This should use `SourceKind`, update when
+        // `--add-noqa` is supported for Jupyter notebooks.
         error!(
             "{}",
-            DisplayParseError::new(err, locator.to_source_code(), source_kind)
+            DisplayParseError::new(err, locator.to_source_code(), None)
         );
     }
 
     // Add any missing `# noqa` pragmas.
-    // TODO(dhruvmanila): Add support for Jupyter Notebooks
     add_noqa(
         path,
         &diagnostics.0,
@@ -376,7 +378,7 @@ pub fn lint_only(
         &directives,
         settings,
         noqa,
-        source_kind,
+        Some(source_kind),
         source_type,
     );
 
@@ -470,7 +472,7 @@ pub fn lint_fix<'a>(
             &directives,
             settings,
             noqa,
-            source_kind,
+            Some(source_kind),
             source_type,
         );
 
@@ -607,133 +609,3 @@ This indicates a bug in `{}`. If you could open an issue at:
         );
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use std::path::Path;
-
-    use anyhow::Result;
-    use test_case::test_case;
-
-    use ruff_notebook::{Notebook, NotebookError};
-
-    use crate::registry::Rule;
-    use crate::source_kind::SourceKind;
-    use crate::test::{test_contents, test_notebook_path, TestedNotebook};
-    use crate::{assert_messages, settings};
-
-    /// Construct a path to a Jupyter notebook in the `resources/test/fixtures/jupyter` directory.
-    fn notebook_path(path: impl AsRef<Path>) -> std::path::PathBuf {
-        Path::new("../ruff_notebook/resources/test/fixtures/jupyter").join(path)
-    }
-
-    #[test]
-    fn test_import_sorting() -> Result<(), NotebookError> {
-        let actual = notebook_path("isort.ipynb");
-        let expected = notebook_path("isort_expected.ipynb");
-        let TestedNotebook {
-            messages,
-            source_notebook,
-            ..
-        } = test_notebook_path(
-            &actual,
-            expected,
-            &settings::Settings::for_rule(Rule::UnsortedImports),
-        )?;
-        assert_messages!(messages, actual, source_notebook);
-        Ok(())
-    }
-
-    #[test]
-    fn test_ipy_escape_command() -> Result<(), NotebookError> {
-        let actual = notebook_path("ipy_escape_command.ipynb");
-        let expected = notebook_path("ipy_escape_command_expected.ipynb");
-        let TestedNotebook {
-            messages,
-            source_notebook,
-            ..
-        } = test_notebook_path(
-            &actual,
-            expected,
-            &settings::Settings::for_rule(Rule::UnusedImport),
-        )?;
-        assert_messages!(messages, actual, source_notebook);
-        Ok(())
-    }
-
-    #[test]
-    fn test_unused_variable() -> Result<(), NotebookError> {
-        let actual = notebook_path("unused_variable.ipynb");
-        let expected = notebook_path("unused_variable_expected.ipynb");
-        let TestedNotebook {
-            messages,
-            source_notebook,
-            ..
-        } = test_notebook_path(
-            &actual,
-            expected,
-            &settings::Settings::for_rule(Rule::UnusedVariable),
-        )?;
-        assert_messages!(messages, actual, source_notebook);
-        Ok(())
-    }
-
-    #[test]
-    fn test_json_consistency() -> Result<()> {
-        let actual_path = notebook_path("before_fix.ipynb");
-        let expected_path = notebook_path("after_fix.ipynb");
-
-        let TestedNotebook {
-            linted_notebook: fixed_notebook,
-            ..
-        } = test_notebook_path(
-            actual_path,
-            &expected_path,
-            &settings::Settings::for_rule(Rule::UnusedImport),
-        )?;
-        let mut writer = Vec::new();
-        fixed_notebook.write(&mut writer)?;
-        let actual = String::from_utf8(writer)?;
-        let expected = std::fs::read_to_string(expected_path)?;
-        assert_eq!(actual, expected);
-        Ok(())
-    }
-
-    #[test_case(Path::new("before_fix.ipynb"), true; "trailing_newline")]
-    #[test_case(Path::new("no_trailing_newline.ipynb"), false; "no_trailing_newline")]
-    fn test_trailing_newline(path: &Path, trailing_newline: bool) -> Result<()> {
-        let notebook = Notebook::from_path(&notebook_path(path))?;
-        assert_eq!(notebook.trailing_newline(), trailing_newline);
-
-        let mut writer = Vec::new();
-        notebook.write(&mut writer)?;
-        let string = String::from_utf8(writer)?;
-        assert_eq!(string.ends_with('\n'), trailing_newline);
-
-        Ok(())
-    }
-
-    // Version <4.5, don't emit cell ids
-    #[test_case(Path::new("no_cell_id.ipynb"), false; "no_cell_id")]
-    // Version 4.5, cell ids are missing and need to be added
-    #[test_case(Path::new("add_missing_cell_id.ipynb"), true; "add_missing_cell_id")]
-    fn test_cell_id(path: &Path, has_id: bool) -> Result<()> {
-        let source_notebook = Notebook::from_path(&notebook_path(path))?;
-        let source_kind = SourceKind::IpyNotebook(source_notebook);
-        let (_, transformed) = test_contents(
-            &source_kind,
-            path,
-            &settings::Settings::for_rule(Rule::UnusedImport),
-        );
-        let linted_notebook = transformed.into_owned().expect_ipy_notebook();
-        let mut writer = Vec::new();
-        linted_notebook.write(&mut writer)?;
-        let actual = String::from_utf8(writer)?;
-        if has_id {
-            assert!(actual.contains(r#""id": ""#));
-        } else {
-            assert!(!actual.contains(r#""id":"#));
-        }
-        Ok(())
-    }
-}