Experiment: allow functions to be redefined (same signature)

2025-05-23 15:08:14 +02:00
145 changed files with 1625 additions and 3608 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -237,13 +237,13 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@67424c1b3680e35255d95971cbd5de0047bf31c3 # v1
+        uses: rui314/setup-mold@e16410e7f8d9e167b74ad5697a9089a35126eb50 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
+        uses: taiki-e/install-action@941e8a4d9d7cdb696bd4f017cf54aca281f8ffff # v2.51.2
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
+        uses: taiki-e/install-action@941e8a4d9d7cdb696bd4f017cf54aca281f8ffff # v2.51.2
        with:
          tool: cargo-insta
      - name: ty mdtests (GitHub annotations)
@@ -295,13 +295,13 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@67424c1b3680e35255d95971cbd5de0047bf31c3 # v1
+        uses: rui314/setup-mold@e16410e7f8d9e167b74ad5697a9089a35126eb50 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
+        uses: taiki-e/install-action@941e8a4d9d7cdb696bd4f017cf54aca281f8ffff # v2.51.2
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
+        uses: taiki-e/install-action@941e8a4d9d7cdb696bd4f017cf54aca281f8ffff # v2.51.2
        with:
          tool: cargo-insta
      - name: "Run tests"
@@ -324,7 +324,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
+        uses: taiki-e/install-action@941e8a4d9d7cdb696bd4f017cf54aca281f8ffff # v2.51.2
        with:
          tool: cargo-nextest
      - name: "Run tests"
@@ -380,7 +380,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@67424c1b3680e35255d95971cbd5de0047bf31c3 # v1
+        uses: rui314/setup-mold@e16410e7f8d9e167b74ad5697a9089a35126eb50 # v1
      - name: "Build"
        run: cargo build --release --locked

@@ -405,13 +405,13 @@ jobs:
          MSRV: ${{ steps.msrv.outputs.value }}
        run: rustup default "${MSRV}"
      - name: "Install mold"
-        uses: rui314/setup-mold@67424c1b3680e35255d95971cbd5de0047bf31c3 # v1
+        uses: rui314/setup-mold@e16410e7f8d9e167b74ad5697a9089a35126eb50 # v1
      - name: "Install cargo nextest"
-        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
+        uses: taiki-e/install-action@941e8a4d9d7cdb696bd4f017cf54aca281f8ffff # v2.51.2
        with:
          tool: cargo-nextest
      - name: "Install cargo insta"
-        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
+        uses: taiki-e/install-action@941e8a4d9d7cdb696bd4f017cf54aca281f8ffff # v2.51.2
        with:
          tool: cargo-insta
      - name: "Run tests"
@@ -459,7 +459,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
+      - uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        name: Download Ruff binary to test
        id: download-cached-binary
@@ -660,7 +660,7 @@ jobs:
          branch: ${{ github.event.pull_request.base.ref }}
          workflow: "ci.yaml"
          check_artifacts: true
-      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
+      - uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
      - name: Fuzz
        env:
          FORCE_COLOR: 1
@@ -730,7 +730,7 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
+      - uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
@@ -773,7 +773,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: Install uv
-        uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
+        uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
      - name: "Install Insiders dependencies"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
        run: uv pip install -r docs/requirements-insiders.txt --system
@@ -910,7 +910,7 @@ jobs:
        run: rustup show

      - name: "Install codspeed"
-        uses: taiki-e/install-action@6c6479b49816fcc0975a31af977bdc1f847c2920 # v2.52.1
+        uses: taiki-e/install-action@941e8a4d9d7cdb696bd4f017cf54aca281f8ffff # v2.51.2
        with:
          tool: cargo-codspeed

--- a/.github/workflows/daily_fuzz.yaml
+++ b/.github/workflows/daily_fuzz.yaml
@@ -34,11 +34,11 @@ jobs:
      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
        with:
          persist-credentials: false
-      - uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
+      - uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
-        uses: rui314/setup-mold@67424c1b3680e35255d95971cbd5de0047bf31c3 # v1
+        uses: rui314/setup-mold@e16410e7f8d9e167b74ad5697a9089a35126eb50 # v1
      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
      - name: Build ruff
        # A debug build means the script runs slower once it gets started,
--- a/.github/workflows/mypy_primer.yaml
+++ b/.github/workflows/mypy_primer.yaml
@@ -37,7 +37,7 @@ jobs:
          persist-credentials: false

      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
+        uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1

      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
        with:
--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@@ -22,7 +22,7 @@ jobs:
      id-token: write
    steps:
      - name: "Install uv"
-        uses: astral-sh/setup-uv@f0ec1fc3b38f5e7cd731bb6ce540c5af426746bb # v6.1.0
+        uses: astral-sh/setup-uv@6b9c6063abd6010835644d4c2e1bef4cf5cd0fca # v6.0.1
      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          pattern: wheels-*
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -80,7 +80,7 @@ repos:
        pass_filenames: false # This makes it a lot faster

  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.11
+    rev: v0.11.10
    hooks:
      - id: ruff-format
      - id: ruff
@@ -98,7 +98,7 @@ repos:
  # zizmor detects security vulnerabilities in GitHub Actions workflows.
  # Additional configuration for the tool is found in `.github/zizmor.yml`
  - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.8.0
+    rev: v1.7.0
    hooks:
      - id: zizmor

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -486,7 +486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
 "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -495,7 +495,7 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -909,7 +909,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
 dependencies = [
 "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -1444,7 +1444,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
 dependencies = [
 "hermit-abi 0.5.1",
 "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -1498,9 +1498,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"

 [[package]]
 name = "jiff"
-version = "0.2.14"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a194df1107f33c79f4f93d02c80798520551949d59dfad22b6157048a88cca93"
+checksum = "f02000660d30638906021176af16b17498bd0d12813dbfe7b276d8bc7f3c0806"
 dependencies = [
 "jiff-static",
 "jiff-tzdb-platform",
@@ -1508,14 +1508,14 @@ dependencies = [
 "portable-atomic",
 "portable-atomic-util",
 "serde",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
 name = "jiff-static"
-version = "0.2.14"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c6e1db7ed32c6c71b759497fae34bf7933636f75a251b9e736555da426f6442"
+checksum = "f3c30758ddd7188629c6713fc45d1188af4f44c90582311d0c8d8c9907f60c48"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3081,7 +3081,6 @@ dependencies = [
 "ruff_workspace",
 "serde",
 "serde-wasm-bindgen",
- "uuid",
 "wasm-bindgen",
 "wasm-bindgen-test",
 ]
@@ -3163,7 +3162,7 @@ dependencies = [
 "errno",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -3532,7 +3531,7 @@ dependencies = [
 "getrandom 0.3.3",
 "once_cell",
 "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -4004,7 +4003,6 @@ dependencies = [
 "ruff_source_file",
 "ruff_text_size",
 "rustc-hash 2.1.1",
- "salsa",
 "serde",
 "serde_json",
 "shellexpand",
@@ -4073,7 +4071,6 @@ dependencies = [
 "ty_ide",
 "ty_project",
 "ty_python_semantic",
- "uuid",
 "wasm-bindgen",
 "wasm-bindgen-test",
 ]
@@ -4243,9 +4240,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"

 [[package]]
 name = "uuid"
-version = "1.17.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
 dependencies = [
 "getrandom 0.3.3",
 "js-sys",
@@ -4256,9 +4253,9 @@ dependencies = [

 [[package]]
 name = "uuid-macro-internal"
-version = "1.17.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b682e8c381995ea03130e381928e0e005b7c9eb483c6c8682f50e07b33c2b7"
+checksum = "72dcd78c4f979627a754f5522cea6e6a25e55139056535fe6e69c506cd64a862"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4526,7 +4523,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -179,6 +179,7 @@ uuid = { version = "1.6.1", features = [
    "v4",
    "fast-rng",
    "macro-diagnostics",
+    "js",
 ] }
 walkdir = { version = "2.3.2" }
 wasm-bindgen = { version = "0.2.92" }
@@ -187,7 +188,7 @@ wild = { version = "2" }
 zip = { version = "0.6.6", default-features = false }

 [workspace.metadata.cargo-shear]
-ignored = ["getrandom", "ruff_options_metadata", "uuid"]
+ignored = ["getrandom", "ruff_options_metadata"]


 [workspace.lints.rust]
--- a/README.md
+++ b/README.md
@@ -34,7 +34,8 @@ An extremely fast Python linter and code formatter, written in Rust.
 - 🔧 Fix support, for automatic error correction (e.g., automatically remove unused imports)
 - 📏 Over [800 built-in rules](https://docs.astral.sh/ruff/rules/), with native re-implementations
    of popular Flake8 plugins, like flake8-bugbear
- ⌨️ First-party [editor integrations](https://docs.astral.sh/ruff/editors) for [VS Code](https://github.com/astral-sh/ruff-vscode) and [more](https://docs.astral.sh/ruff/editors/setup)
+- ⌨️ First-party [editor integrations](https://docs.astral.sh/ruff/integrations/) for
+    [VS Code](https://github.com/astral-sh/ruff-vscode) and [more](https://docs.astral.sh/ruff/editors/setup)
 - 🌎 Monorepo-friendly, with [hierarchical and cascading configuration](https://docs.astral.sh/ruff/configuration/#config-file-discovery)

 Ruff aims to be orders of magnitude faster than alternative tools while integrating more
--- a/crates/ruff_benchmark/benches/ty.rs
+++ b/crates/ruff_benchmark/benches/ty.rs
@@ -78,7 +78,7 @@ fn setup_tomllib_case() -> Case {

    let src_root = SystemPath::new("/src");
    let mut metadata = ProjectMetadata::discover(src_root, &system).unwrap();
-    metadata.apply_options(Options {
+    metadata.apply_cli_options(Options {
        environment: Some(EnvironmentOptions {
            python_version: Some(RangedValue::cli(PythonVersion::PY312)),
            ..EnvironmentOptions::default()
@@ -131,7 +131,7 @@ fn benchmark_incremental(criterion: &mut Criterion) {
    fn setup() -> Case {
        let case = setup_tomllib_case();

-        let result: Vec<_> = case.db.check();
+        let result: Vec<_> = case.db.check().unwrap();

        assert_diagnostics(&case.db, &result, EXPECTED_TOMLLIB_DIAGNOSTICS);

@@ -159,7 +159,7 @@ fn benchmark_incremental(criterion: &mut Criterion) {
            None,
        );

-        let result = db.check();
+        let result = db.check().unwrap();

        assert_eq!(result.len(), EXPECTED_TOMLLIB_DIAGNOSTICS.len());
    }
@@ -179,7 +179,7 @@ fn benchmark_cold(criterion: &mut Criterion) {
            setup_tomllib_case,
            |case| {
                let Case { db, .. } = case;
-                let result: Vec<_> = db.check();
+                let result: Vec<_> = db.check().unwrap();

                assert_diagnostics(db, &result, EXPECTED_TOMLLIB_DIAGNOSTICS);
            },
@@ -224,7 +224,7 @@ fn setup_micro_case(code: &str) -> Case {

    let src_root = SystemPath::new("/src");
    let mut metadata = ProjectMetadata::discover(src_root, &system).unwrap();
-    metadata.apply_options(Options {
+    metadata.apply_cli_options(Options {
        environment: Some(EnvironmentOptions {
            python_version: Some(RangedValue::cli(PythonVersion::PY312)),
            ..EnvironmentOptions::default()
@@ -293,7 +293,7 @@ fn benchmark_many_string_assignments(criterion: &mut Criterion) {
            },
            |case| {
                let Case { db, .. } = case;
-                let result = db.check();
+                let result = db.check().unwrap();
                assert_eq!(result.len(), 0);
            },
            BatchSize::SmallInput,
@@ -339,7 +339,7 @@ fn benchmark_many_tuple_assignments(criterion: &mut Criterion) {
            },
            |case| {
                let Case { db, .. } = case;
-                let result = db.check();
+                let result = db.check().unwrap();
                assert_eq!(result.len(), 0);
            },
            BatchSize::SmallInput,
--- a/crates/ruff_db/src/panic.rs
+++ b/crates/ruff_db/src/panic.rs
@@ -1,4 +1,3 @@
-use std::any::Any;
 use std::backtrace::BacktraceStatus;
 use std::cell::Cell;
 use std::panic::Location;
@@ -25,25 +24,17 @@ impl Payload {
            None
        }
    }
-
-    pub fn downcast_ref<R: Any>(&self) -> Option<&R> {
-        self.0.downcast_ref::<R>()
-    }
 }

 impl std::fmt::Display for PanicError {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "panicked at")?;
+        writeln!(f, "panicked at")?;
        if let Some(location) = &self.location {
            write!(f, " {location}")?;
        }
        if let Some(payload) = self.payload.as_str() {
            write!(f, ":\n{payload}")?;
        }
-        if let Some(query_trace) = self.salsa_backtrace.as_ref() {
-            let _ = writeln!(f, "{query_trace}");
-        }
-
        if let Some(backtrace) = &self.backtrace {
            match backtrace.status() {
                BacktraceStatus::Disabled => {
@@ -58,7 +49,6 @@ impl std::fmt::Display for PanicError {
                _ => {}
            }
        }
-
        Ok(())
    }
 }
--- a/crates/ruff_dev/src/generate_rules_table.rs
+++ b/crates/ruff_dev/src/generate_rules_table.rs
@@ -18,43 +18,44 @@ const FIX_SYMBOL: &str = "🛠️";
 const PREVIEW_SYMBOL: &str = "🧪";
 const REMOVED_SYMBOL: &str = "❌";
 const WARNING_SYMBOL: &str = "⚠️";
+const STABLE_SYMBOL: &str = "✔️";
 const SPACER: &str = "&nbsp;&nbsp;&nbsp;&nbsp;";

-/// Style for the rule's fixability and status icons.
-const SYMBOL_STYLE: &str = "style='width: 1em; display: inline-block;'";
-/// Style for the container wrapping the fixability and status icons.
-const SYMBOLS_CONTAINER: &str = "style='display: flex; gap: 0.5rem; justify-content: end;'";
-
 fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>, linter: &Linter) {
-    table_out.push_str("| Code | Name | Message |    |");
+    table_out.push_str("| Code | Name | Message | |");
    table_out.push('\n');
-    table_out.push_str("| ---- | ---- | ------- | -: |");
+    table_out.push_str("| ---- | ---- | ------- | ------: |");
    table_out.push('\n');
    for rule in rules {
        let status_token = match rule.group() {
            RuleGroup::Removed => {
-                format!(
-                    "<span {SYMBOL_STYLE} title='Rule has been removed'>{REMOVED_SYMBOL}</span>"
-                )
+                format!("<span title='Rule has been removed'>{REMOVED_SYMBOL}</span>")
            }
            RuleGroup::Deprecated => {
-                format!(
-                    "<span {SYMBOL_STYLE} title='Rule has been deprecated'>{WARNING_SYMBOL}</span>"
-                )
+                format!("<span title='Rule has been deprecated'>{WARNING_SYMBOL}</span>")
            }
            RuleGroup::Preview => {
-                format!("<span {SYMBOL_STYLE} title='Rule is in preview'>{PREVIEW_SYMBOL}</span>")
+                format!("<span title='Rule is in preview'>{PREVIEW_SYMBOL}</span>")
+            }
+            RuleGroup::Stable => {
+                // A full opacity checkmark is a bit aggressive for indicating stable
+                format!("<span title='Rule is stable' style='opacity: 0.6'>{STABLE_SYMBOL}</span>")
            }
-            RuleGroup::Stable => format!("<span {SYMBOL_STYLE}></span>"),
        };

        let fix_token = match rule.fixable() {
            FixAvailability::Always | FixAvailability::Sometimes => {
-                format!("<span {SYMBOL_STYLE} title='Automatic fix available'>{FIX_SYMBOL}</span>")
+                format!("<span title='Automatic fix available'>{FIX_SYMBOL}</span>")
+            }
+            FixAvailability::None => {
+                format!(
+                    "<span title='Automatic fix not available' style='opacity: 0.1' aria-hidden='true'>{FIX_SYMBOL}</span>"
+                )
            }
-            FixAvailability::None => format!("<span {SYMBOL_STYLE}></span>"),
        };

+        let tokens = format!("{status_token} {fix_token}");
+
        let rule_name = rule.as_ref();

        // If the message ends in a bracketed expression (like: "Use {replacement}"), escape the
@@ -81,14 +82,15 @@ fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>,
        #[expect(clippy::or_fun_call)]
        let _ = write!(
            table_out,
-            "| {ss}{prefix}{code}{se} {{ #{prefix}{code} }} | {ss}{explanation}{se} | {ss}{message}{se} | <div {SYMBOLS_CONTAINER}>{status_token}{fix_token}</div>|",
-            prefix = linter.common_prefix(),
-            code = linter.code_for_rule(rule).unwrap(),
-            explanation = rule
-                .explanation()
+            "| {ss}{0}{1}{se} {{ #{0}{1} }} | {ss}{2}{se} | {ss}{3}{se} | {ss}{4}{se} |",
+            linter.common_prefix(),
+            linter.code_for_rule(rule).unwrap(),
+            rule.explanation()
                .is_some()
                .then_some(format_args!("[{rule_name}](rules/{rule_name}.md)"))
                .unwrap_or(format_args!("{rule_name}")),
+            message,
+            tokens,
        );
        table_out.push('\n');
    }
@@ -102,6 +104,12 @@ pub(crate) fn generate() -> String {
    table_out.push_str("### Legend");
    table_out.push('\n');

+    let _ = write!(
+        &mut table_out,
+        "{SPACER}{STABLE_SYMBOL}{SPACER} The rule is stable."
+    );
+    table_out.push_str("<br />");
+
    let _ = write!(
        &mut table_out,
        "{SPACER}{PREVIEW_SYMBOL}{SPACER} The rule is unstable and is in [\"preview\"](faq.md#what-is-preview)."
@@ -124,8 +132,7 @@ pub(crate) fn generate() -> String {
        &mut table_out,
        "{SPACER}{FIX_SYMBOL}{SPACER} The rule is automatically fixable by the `--fix` command-line option."
    );
-    table_out.push_str("\n\n");
-    table_out.push_str("All rules not marked as preview, deprecated or removed are stable.");
+    table_out.push_str("<br />");
    table_out.push('\n');

    for linter in Linter::iter() {
--- a/crates/ruff_linter/resources/test/fixtures/airflow/AIR302_common_sql.py
+++ b/crates/ruff_linter/resources/test/fixtures/airflow/AIR302_common_sql.py
@@ -114,11 +114,16 @@ from airflow.sensors.sql_sensor import SqlSensor
 SqlSensor()


-from airflow.providers.common.sql.operators.sql import SQLExecuteQueryOperator
+from airflow.operators.jdbc_operator import JdbcOperator
+from airflow.operators.mssql_operator import MsSqlOperator
+from airflow.operators.mysql_operator import MySqlOperator
+from airflow.operators.oracle_operator import OracleOperator
+from airflow.operators.postgres_operator import PostgresOperator
+from airflow.operators.sqlite_operator import SqliteOperator

-SQLExecuteQueryOperator()
-SQLExecuteQueryOperator()
-SQLExecuteQueryOperator()
-SQLExecuteQueryOperator()
-SQLExecuteQueryOperator()
-SQLExecuteQueryOperator()
+JdbcOperator()
+MsSqlOperator()
+MySqlOperator()
+OracleOperator()
+PostgresOperator()
+SqliteOperator()
--- a/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC115.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC115.py
@@ -145,23 +145,3 @@ def func():
            sleep = 10

    anyio.run(main)
-
-
-async def test_anyio_async115_helpers():
-    import anyio
-
-    await anyio.sleep(delay=1)  # OK
-    await anyio.sleep(seconds=1)  # OK
-
-    await anyio.sleep(delay=0)  # ASYNC115
-    await anyio.sleep(seconds=0)  # OK
-
-
-async def test_trio_async115_helpers():
-    import trio
-
-    await trio.sleep(seconds=1)  # OK
-    await trio.sleep(delay=1)  # OK
-
-    await trio.sleep(seconds=0)  # ASYNC115
-    await trio.sleep(delay=0)  # OK
--- a/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC116.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_async/ASYNC116.py
@@ -108,23 +108,3 @@ async def import_from_anyio():

    # catch from import
    await sleep(86401)  # error: 116, "async"
-
-
-async def test_anyio_async116_helpers():
-    import anyio
-
-    await anyio.sleep(delay=1)  # OK
-    await anyio.sleep(seconds=1)  # OK
-
-    await anyio.sleep(delay=86401)  # ASYNC116
-    await anyio.sleep(seconds=86401)  # OK
-
-
-async def test_trio_async116_helpers():
-    import trio
-
-    await trio.sleep(seconds=1)  # OK
-    await trio.sleep(delay=1)  # OK
-
-    await trio.sleep(seconds=86401)  # ASYNC116
-    await trio.sleep(delay=86401)  # OK
--- a/crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC.py
+++ b/crates/ruff_linter/resources/test/fixtures/flake8_implicit_str_concat/ISC.py
@@ -91,99 +91,3 @@ _ = "\8""0" # fix should be "\80"
 _ = "\12""8" # fix should be "\128"
 _ = "\12""foo" # fix should be "\12foo"
 _ = "\12" ""  # fix should be "\12"
-
-
-# Mixed literal + non-literal scenarios
-_ = (
-    "start" +
-    variable +
-    "end"
-)
-
-_ = (
-    f"format" +
-    func_call() +
-    "literal"
-)
-
-_ = (
-    rf"raw_f{x}" +
-    r"raw_normal"
-)
-
-
-# Different prefix combinations
-_ = (
-    u"unicode" +
-    r"raw"
-)
-
-_ = (
-    rb"raw_bytes" +
-    b"normal_bytes"
-)
-
-_ = (
-    b"bytes" +
-    b"with_bytes"
-)
-
-# Repeated concatenation
-
-_ = ("a" +
-    "b" +
-    "c" +
-    "d" + "e"
-)
-
-_ = ("a"
-    + "b"
-    + "c"
-    + "d"
-    + "e"
-)
-
-_ = (
-    "start" +
-    variable + # comment
-    "end"
-)
-
-_ = (
-    "start" +
-    variable
-		# leading comment
-    + "end"
-)
-
-_ = (
-    "first"
-    +    "second"  # extra spaces around +
-)
-
-_ = (
-    "first"    +  # trailing spaces before +
-    "second"
-)
-
-_ = ((
-    "deep" +
-    "nesting"
-))
-
-_ = (
-    "contains + plus" +
-    "another string"
-)
-
-_ = (
-    "start"
-		# leading comment
-    + "end"
-)
-
-_ = (
-    "start" +
-		# leading comment
-    "end"
-)
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP010.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP010.py
@@ -12,4 +12,3 @@ if True:
 if True:
    from __future__ import generator_stop
    from __future__ import invalid_module, generators
-    from __future__ import generators  # comment
--- a/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP050.py
+++ b/crates/ruff_linter/resources/test/fixtures/pyupgrade/UP050.py
@@ -1,84 +0,0 @@
-class A:
-    ...
-
-
-class A(metaclass=type):
-    ...
-
-
-class A(
-    metaclass=type
-):
-    ...
-
-
-class A(
-    metaclass=type
-    #
-):
-    ...
-
-
-class A(
-    #
-    metaclass=type
-):
-    ...
-
-
-class A(
-    metaclass=type,
-    #
-):
-    ...
-
-
-class A(
-    #
-    metaclass=type,
-    #
-):
-    ...
-
-
-class B(A, metaclass=type):
-    ...
-
-
-class B(
-    A,
-    metaclass=type,
-):
-    ...
-
-
-class B(
-    A,
-    # comment
-    metaclass=type,
-):
-    ...
-
-
-def foo():
-    class A(metaclass=type):
-        ...
-
-
-class A(
-    metaclass=type  # comment
-    ,
-):
-    ...
-
-
-type = str
-
-class Foo(metaclass=type):
-    ...
-
-
-import builtins
-
-class A(metaclass=builtins.type):
-    ...
--- a/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/expression.rs
@@ -1364,8 +1364,11 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
            op: Operator::Add, ..
        }) => {
            if checker.enabled(Rule::ExplicitStringConcatenation) {
-                if let Some(diagnostic) = flake8_implicit_str_concat::rules::explicit(expr, checker)
-                {
+                if let Some(diagnostic) = flake8_implicit_str_concat::rules::explicit(
+                    expr,
+                    checker.locator,
+                    checker.settings,
+                ) {
                    checker.report_diagnostic(diagnostic);
                }
            }
--- a/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
+++ b/crates/ruff_linter/src/checkers/ast/analyze/statement.rs
@@ -439,9 +439,6 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
            if checker.enabled(Rule::UselessObjectInheritance) {
                pyupgrade::rules::useless_object_inheritance(checker, class_def);
            }
-            if checker.enabled(Rule::UselessClassMetaclassType) {
-                pyupgrade::rules::useless_class_metaclass_type(checker, class_def);
-            }
            if checker.enabled(Rule::ReplaceStrEnum) {
                if checker.target_version() >= PythonVersion::PY311 {
                    pyupgrade::rules::replace_str_enum(checker, class_def);
--- a/crates/ruff_linter/src/codes.rs
+++ b/crates/ruff_linter/src/codes.rs
@@ -552,7 +552,6 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
        (Pyupgrade, "046") => (RuleGroup::Preview, rules::pyupgrade::rules::NonPEP695GenericClass),
        (Pyupgrade, "047") => (RuleGroup::Preview, rules::pyupgrade::rules::NonPEP695GenericFunction),
        (Pyupgrade, "049") => (RuleGroup::Preview, rules::pyupgrade::rules::PrivateTypeParameter),
-        (Pyupgrade, "050") => (RuleGroup::Preview, rules::pyupgrade::rules::UselessClassMetaclassType),

        // pydocstyle
        (Pydocstyle, "100") => (RuleGroup::Stable, rules::pydocstyle::rules::UndocumentedPublicModule),
--- a/crates/ruff_linter/src/rules/airflow/rules/moved_to_provider_in_3.rs
+++ b/crates/ruff_linter/src/rules/airflow/rules/moved_to_provider_in_3.rs
@@ -65,26 +65,24 @@ impl Violation for Airflow3MovedToProvider {

    fn fix_title(&self) -> Option<String> {
        let Airflow3MovedToProvider { replacement, .. } = self;
-        if let Some((module, name, provider, version)) = match &replacement {
-            ProviderReplacement::AutoImport {
-                module,
-                name,
-                provider,
-                version,
-            } => Some((module, *name, provider, version)),
-            ProviderReplacement::SourceModuleMovedToProvider {
-                module,
-                name,
-                provider,
-                version,
-            } => Some((module, name.as_str(), provider, version)),
+        match replacement {
            ProviderReplacement::None => None,
-        } {
-            Some(format!(
-                "Install `apache-airflow-providers-{provider}>={version}` and use `{name}` from `{module}` instead."
-            ))
-        } else {
-            None
+            ProviderReplacement::AutoImport {
+                name,
+                module,
+                provider,
+                version,
+            } => Some(format!(
+                "Install `apache-airflow-providers-{provider}>={version}` and use `{module}.{name}` instead."
+            )),
+            ProviderReplacement::SourceModuleMovedToProvider {
+                name,
+                module,
+                provider,
+                version,
+            } => Some(format!(
+                "Install `apache-airflow-providers-{provider}>={version}` and use `{module}.{name}` instead."
+            )),
        }
    }
 }
--- a/crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs
+++ b/crates/ruff_linter/src/rules/airflow/rules/removal_in_3.rs
@@ -73,10 +73,10 @@ impl Violation for Airflow3Removal {
            Replacement::AttrName(name) => Some(format!("Use `{name}` instead")),
            Replacement::Message(message) => Some((*message).to_string()),
            Replacement::AutoImport { module, name } => {
-                Some(format!("Use `{name}` from `{module}` instead."))
+                Some(format!("Use `{module}.{name}` instead"))
            }
            Replacement::SourceModuleMoved { module, name } => {
-                Some(format!("Use `{name}` from `{module}` instead."))
+                Some(format!("Use `{module}.{name}` instead"))
            }
        }
    }
--- a/crates/ruff_linter/src/rules/airflow/rules/suggested_to_move_to_provider_in_3.rs
+++ b/crates/ruff_linter/src/rules/airflow/rules/suggested_to_move_to_provider_in_3.rs
@@ -77,7 +77,7 @@ impl Violation for Airflow3SuggestedToMoveToProvider {
                provider,
                version,
            } => Some(format!(
-                "Install `apache-airflow-providers-{provider}>={version}` and use `{name}` from `{module}` instead."
+                "Install `apache-airflow-providers-{provider}>={version}` and use `{module}.{name}` instead."
            )),
            ProviderReplacement::SourceModuleMovedToProvider {
                module,
@@ -85,7 +85,7 @@ impl Violation for Airflow3SuggestedToMoveToProvider {
                provider,
                version,
            } => Some(format!(
-                "Install `apache-airflow-providers-{provider}>={version}` and use `{name}` from `{module}` instead."
+                "Install `apache-airflow-providers-{provider}>={version}` and use `{module}.{name}` instead."
            )),
        }
    }
--- a/crates/ruff_linter/src/rules/airflow/rules/suggested_to_update_3_0.rs
+++ b/crates/ruff_linter/src/rules/airflow/rules/suggested_to_update_3_0.rs
@@ -72,10 +72,10 @@ impl Violation for Airflow3SuggestedUpdate {
            Replacement::AttrName(name) => Some(format!("Use `{name}` instead")),
            Replacement::Message(message) => Some((*message).to_string()),
            Replacement::AutoImport { module, name } => {
-                Some(format!("Use `{name}` from `{module}` instead."))
+                Some(format!("Use `{module}.{name}` instead"))
            }
            Replacement::SourceModuleMoved { module, name } => {
-                Some(format!("Use `{name}` from `{module}` instead."))
+                Some(format!("Use `{module}.{name}` instead"))
            }
        }
    }
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR301_AIR301_class_attribute.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR301_AIR301_class_attribute.py.snap
@@ -171,7 +171,7 @@ AIR301_class_attribute.py:42:6: AIR301 [*] `airflow.datasets.manager.DatasetMana
 43 | dm.register_dataset_change()
 44 | dm.create_datasets()
   |
-   = help: Use `AssetManager` from `airflow.assets.manager` instead.
+   = help: Use `airflow.assets.manager.AssetManager` instead

 ℹ Safe fix
 19 19 | from airflow.providers_manager import ProvidersManager
@@ -302,7 +302,7 @@ AIR301_class_attribute.py:50:11: AIR301 [*] `airflow.lineage.hook.DatasetLineage
   |           ^^^^^^^^^^^^^^^^^^ AIR301
 51 | dl_info.dataset
   |
-   = help: Use `AssetLineageInfo` from `airflow.lineage.hook` instead.
+   = help: Use `airflow.lineage.hook.AssetLineageInfo` instead

 ℹ Safe fix
 9  9  |     DatasetAny,
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR301_AIR301_names.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR301_AIR301_names.py.snap
@@ -85,7 +85,7 @@ AIR301_names.py:60:1: AIR301 [*] `airflow.configuration.get` is removed in Airfl
 60 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
   | ^^^ AIR301
   |
-   = help: Use `conf.get` from `airflow.configuration` instead.
+   = help: Use `airflow.configuration.conf.get` instead

 ℹ Safe fix
 19 19 |     has_option,
@@ -111,7 +111,7 @@ AIR301_names.py:60:6: AIR301 [*] `airflow.configuration.getboolean` is removed i
 60 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
   |      ^^^^^^^^^^ AIR301
   |
-   = help: Use `conf.getboolean` from `airflow.configuration` instead.
+   = help: Use `airflow.configuration.conf.getboolean` instead

 ℹ Safe fix
 19 19 |     has_option,
@@ -137,7 +137,7 @@ AIR301_names.py:60:18: AIR301 [*] `airflow.configuration.getfloat` is removed in
 60 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
   |                  ^^^^^^^^ AIR301
   |
-   = help: Use `conf.getfloat` from `airflow.configuration` instead.
+   = help: Use `airflow.configuration.conf.getfloat` instead

 ℹ Safe fix
 19 19 |     has_option,
@@ -163,7 +163,7 @@ AIR301_names.py:60:28: AIR301 [*] `airflow.configuration.getint` is removed in A
 60 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
   |                            ^^^^^^ AIR301
   |
-   = help: Use `conf.getint` from `airflow.configuration` instead.
+   = help: Use `airflow.configuration.conf.getint` instead

 ℹ Safe fix
 19 19 |     has_option,
@@ -189,7 +189,7 @@ AIR301_names.py:60:36: AIR301 [*] `airflow.configuration.has_option` is removed
 60 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
   |                                    ^^^^^^^^^^ AIR301
   |
-   = help: Use `conf.has_option` from `airflow.configuration` instead.
+   = help: Use `airflow.configuration.conf.has_option` instead

 ℹ Safe fix
 19 19 |     has_option,
@@ -215,7 +215,7 @@ AIR301_names.py:60:48: AIR301 [*] `airflow.configuration.remove_option` is remov
 60 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
   |                                                ^^^^^^^^^^^^^ AIR301
   |
-   = help: Use `conf.remove_option` from `airflow.configuration` instead.
+   = help: Use `airflow.configuration.conf.remove_option` instead

 ℹ Safe fix
 19 19 |     has_option,
@@ -241,7 +241,7 @@ AIR301_names.py:60:63: AIR301 [*] `airflow.configuration.as_dict` is removed in
 60 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
   |                                                               ^^^^^^^ AIR301
   |
-   = help: Use `conf.as_dict` from `airflow.configuration` instead.
+   = help: Use `airflow.configuration.conf.as_dict` instead

 ℹ Safe fix
 19 19 |     has_option,
@@ -267,7 +267,7 @@ AIR301_names.py:60:72: AIR301 [*] `airflow.configuration.set` is removed in Airf
 60 | get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set
   |                                                                        ^^^ AIR301
   |
-   = help: Use `conf.set` from `airflow.configuration` instead.
+   = help: Use `airflow.configuration.conf.set` instead

 ℹ Safe fix
 19 19 |     has_option,
@@ -308,7 +308,7 @@ AIR301_names.py:72:1: AIR301 `airflow.hooks.base_hook.BaseHook` is removed in Ai
 72 | BaseHook()
   | ^^^^^^^^ AIR301
   |
-   = help: Use `BaseHook` from `airflow.hooks.base` instead.
+   = help: Use `airflow.hooks.base.BaseHook` instead

 AIR301_names.py:76:1: AIR301 `airflow.operators.subdag.SubDagOperator` is removed in Airflow 3.0
   |
@@ -324,7 +324,7 @@ AIR301_names.py:85:1: AIR301 `airflow.sensors.base_sensor_operator.BaseSensorOpe
 85 | BaseSensorOperator()
   | ^^^^^^^^^^^^^^^^^^ AIR301
   |
-   = help: Use `BaseSensorOperator` from `airflow.sdk.bases.sensor` instead.
+   = help: Use `airflow.sdk.bases.sensor.BaseSensorOperator` instead

 AIR301_names.py:89:1: AIR301 `airflow.triggers.external_task.TaskStateTrigger` is removed in Airflow 3.0
   |
@@ -446,7 +446,7 @@ AIR301_names.py:117:1: AIR301 `airflow.utils.file.TemporaryDirectory` is removed
    | ^^^^^^^^^^^^^^^^^^ AIR301
 118 | mkdirs
    |
-    = help: Use `TemporaryDirectory` from `tempfile` instead.
+    = help: Use `tempfile.TemporaryDirectory` instead

 AIR301_names.py:118:1: AIR301 `airflow.utils.file.mkdirs` is removed in Airflow 3.0
    |
@@ -466,7 +466,7 @@ AIR301_names.py:121:1: AIR301 [*] `airflow.utils.helpers.chain` is removed in Ai
    | ^^^^^^^^^^^^ AIR301
 122 | helper_cross_downstream
    |
-    = help: Use `chain` from `airflow.sdk` instead.
+    = help: Use `airflow.sdk.chain` instead

 ℹ Safe fix
 48  48  | from airflow.utils.trigger_rule import TriggerRule
@@ -495,7 +495,7 @@ AIR301_names.py:122:1: AIR301 [*] `airflow.utils.helpers.cross_downstream` is re
 123 |
 124 | #  airflow.utils.log
    |
-    = help: Use `cross_downstream` from `airflow.sdk` instead.
+    = help: Use `airflow.sdk.cross_downstream` instead

 ℹ Safe fix
 48  48  | from airflow.utils.trigger_rule import TriggerRule
@@ -523,7 +523,7 @@ AIR301_names.py:125:1: AIR301 `airflow.utils.log.secrets_masker` is removed in A
 126 |
 127 | # airflow.utils.state
    |
-    = help: Use `secrets_masker` from `airflow.sdk.execution_time` instead.
+    = help: Use `airflow.sdk.execution_time.secrets_masker` instead

 AIR301_names.py:128:1: AIR301 `airflow.utils.state.SHUTDOWN` is removed in Airflow 3.0
    |
@@ -595,7 +595,7 @@ AIR301_names.py:146:1: AIR301 `airflow.operators.python.get_current_context` is
 147 |
 148 | # airflow.providers.mysql
    |
-    = help: Use `get_current_context` from `airflow.sdk` instead.
+    = help: Use `airflow.sdk.get_current_context` instead

 AIR301_names.py:151:1: AIR301 `airflow.providers.mysql.datasets.mysql.sanitize_uri` is removed in Airflow 3.0
    |
@@ -606,7 +606,7 @@ AIR301_names.py:151:1: AIR301 `airflow.providers.mysql.datasets.mysql.sanitize_u
 152 |
 153 | # airflow.providers.postgres
    |
-    = help: Use `sanitize_uri` from `airflow.providers.mysql.assets.mysql` instead.
+    = help: Use `airflow.providers.mysql.assets.mysql.sanitize_uri` instead

 AIR301_names.py:156:1: AIR301 `airflow.providers.postgres.datasets.postgres.sanitize_uri` is removed in Airflow 3.0
    |
@@ -617,7 +617,7 @@ AIR301_names.py:156:1: AIR301 `airflow.providers.postgres.datasets.postgres.sani
 157 |
 158 | # airflow.providers.trino
    |
-    = help: Use `sanitize_uri` from `airflow.providers.postgres.assets.postgres` instead.
+    = help: Use `airflow.providers.postgres.assets.postgres.sanitize_uri` instead

 AIR301_names.py:161:1: AIR301 `airflow.providers.trino.datasets.trino.sanitize_uri` is removed in Airflow 3.0
    |
@@ -628,7 +628,7 @@ AIR301_names.py:161:1: AIR301 `airflow.providers.trino.datasets.trino.sanitize_u
 162 |
 163 | # airflow.notifications.basenotifier
    |
-    = help: Use `sanitize_uri` from `airflow.providers.trino.assets.trino` instead.
+    = help: Use `airflow.providers.trino.assets.trino.sanitize_uri` instead

 AIR301_names.py:166:1: AIR301 `airflow.notifications.basenotifier.BaseNotifier` is removed in Airflow 3.0
    |
@@ -639,7 +639,7 @@ AIR301_names.py:166:1: AIR301 `airflow.notifications.basenotifier.BaseNotifier`
 167 |
 168 | # airflow.auth.manager
    |
-    = help: Use `BaseNotifier` from `airflow.sdk.bases.notifier` instead.
+    = help: Use `airflow.sdk.bases.notifier.BaseNotifier` instead

 AIR301_names.py:171:1: AIR301 `airflow.auth.managers.base_auth_manager.BaseAuthManager` is removed in Airflow 3.0
    |
@@ -648,4 +648,4 @@ AIR301_names.py:171:1: AIR301 `airflow.auth.managers.base_auth_manager.BaseAuthM
 171 | BaseAuthManager()
    | ^^^^^^^^^^^^^^^ AIR301
    |
-    = help: Use `BaseAuthManager` from `airflow.api_fastapi.auth.managers.base_auth_manager` instead.
+    = help: Use `airflow.api_fastapi.auth.managers.base_auth_manager.BaseAuthManager` instead
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR301_AIR301_names_fix.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR301_AIR301_names_fix.py.snap
@@ -10,7 +10,7 @@ AIR301_names_fix.py:19:1: AIR301 [*] `airflow.api_connexion.security.requires_ac
 20 |
 21 | DatasetDetails()
   |
-   = help: Use `requires_access_asset` from `airflow.api_fastapi.core_api.security` instead.
+   = help: Use `airflow.api_fastapi.core_api.security.requires_access_asset` instead

 ℹ Safe fix
 15 15 | from airflow.secrets.local_filesystm import load_connections
@@ -31,7 +31,7 @@ AIR301_names_fix.py:21:1: AIR301 [*] `airflow.auth.managers.models.resource_deta
 21 | DatasetDetails()
   | ^^^^^^^^^^^^^^ AIR301
   |
-   = help: Use `AssetDetails` from `airflow.api_fastapi.auth.managers.models.resource_details` instead.
+   = help: Use `airflow.api_fastapi.auth.managers.models.resource_details.AssetDetails` instead

 ℹ Safe fix
 15 15 | from airflow.secrets.local_filesystm import load_connections
@@ -54,7 +54,7 @@ AIR301_names_fix.py:24:1: AIR301 [*] `airflow.datasets.manager.DatasetManager` i
 25 | dataset_manager()
 26 | resolve_dataset_manager()
   |
-   = help: Use `AssetManager` from `airflow.assets.manager` instead.
+   = help: Use `airflow.assets.manager.AssetManager` instead

 ℹ Safe fix
 15 15 | from airflow.secrets.local_filesystm import load_connections
@@ -80,7 +80,7 @@ AIR301_names_fix.py:25:1: AIR301 [*] `airflow.datasets.manager.dataset_manager`
   | ^^^^^^^^^^^^^^^ AIR301
 26 | resolve_dataset_manager()
   |
-   = help: Use `asset_manager` from `airflow.assets.manager` instead.
+   = help: Use `airflow.assets.manager.asset_manager` instead

 ℹ Safe fix
 15 15 | from airflow.secrets.local_filesystm import load_connections
@@ -109,7 +109,7 @@ AIR301_names_fix.py:26:1: AIR301 [*] `airflow.datasets.manager.resolve_dataset_m
 27 |
 28 | DatasetLineageInfo()
   |
-   = help: Use `resolve_asset_manager` from `airflow.assets.manager` instead.
+   = help: Use `airflow.assets.manager.resolve_asset_manager` instead

 ℹ Safe fix
 15 15 | from airflow.secrets.local_filesystm import load_connections
@@ -138,7 +138,7 @@ AIR301_names_fix.py:28:1: AIR301 [*] `airflow.lineage.hook.DatasetLineageInfo` i
 29 |
 30 | AllowListValidator()
   |
-   = help: Use `AssetLineageInfo` from `airflow.lineage.hook` instead.
+   = help: Use `airflow.lineage.hook.AssetLineageInfo` instead

 ℹ Safe fix
 10 10 |     dataset_manager,
@@ -167,7 +167,7 @@ AIR301_names_fix.py:30:1: AIR301 [*] `airflow.metrics.validators.AllowListValida
   | ^^^^^^^^^^^^^^^^^^ AIR301
 31 | BlockListValidator()
   |
-   = help: Use `PatternAllowListValidator` from `airflow.metrics.validators` instead.
+   = help: Use `airflow.metrics.validators.PatternAllowListValidator` instead

 ℹ Safe fix
 11 11 |     resolve_dataset_manager,
@@ -196,7 +196,7 @@ AIR301_names_fix.py:31:1: AIR301 [*] `airflow.metrics.validators.BlockListValida
 32 |
 33 | load_connections()
   |
-   = help: Use `PatternBlockListValidator` from `airflow.metrics.validators` instead.
+   = help: Use `airflow.metrics.validators.PatternBlockListValidator` instead

 ℹ Safe fix
 11 11 |     resolve_dataset_manager,
@@ -226,7 +226,7 @@ AIR301_names_fix.py:35:1: AIR301 [*] `airflow.security.permissions.RESOURCE_DATA
 36 |
 37 | has_access_dataset()
   |
-   = help: Use `RESOURCE_ASSET` from `airflow.security.permissions` instead.
+   = help: Use `airflow.security.permissions.RESOURCE_ASSET` instead

 ℹ Safe fix
 13 13 | from airflow.lineage.hook import DatasetLineageInfo
@@ -265,7 +265,7 @@ AIR301_names_fix.py:44:1: AIR301 [*] `airflow.listeners.spec.dataset.on_dataset_
   | ^^^^^^^^^^^^^^^^^^ AIR301
 45 | on_dataset_changed()
   |
-   = help: Use `on_asset_created` from `airflow.listeners.spec.asset` instead.
+   = help: Use `airflow.listeners.spec.asset.on_asset_created` instead

 ℹ Safe fix
 40 40 |     on_dataset_changed,
@@ -283,7 +283,7 @@ AIR301_names_fix.py:45:1: AIR301 [*] `airflow.listeners.spec.dataset.on_dataset_
 45 | on_dataset_changed()
   | ^^^^^^^^^^^^^^^^^^ AIR301
   |
-   = help: Use `on_asset_changed` from `airflow.listeners.spec.asset` instead.
+   = help: Use `airflow.listeners.spec.asset.on_asset_changed` instead

 ℹ Safe fix
 40 40 |     on_dataset_changed,
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR301_AIR301_provider_names_fix.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR301_AIR301_provider_names_fix.py.snap
@@ -10,7 +10,7 @@ AIR301_provider_names_fix.py:25:1: AIR301 [*] `airflow.providers.amazon.aws.auth
 26 |
 27 | s3_create_dataset()
   |
-   = help: Use `AvpEntities.ASSET` from `airflow.providers.amazon.aws.auth_manager.avp.entities` instead.
+   = help: Use `airflow.providers.amazon.aws.auth_manager.avp.entities.AvpEntities.ASSET` instead

 ℹ Safe fix
 22 22 |     translate_airflow_dataset,
@@ -30,7 +30,7 @@ AIR301_provider_names_fix.py:27:1: AIR301 [*] `airflow.providers.amazon.aws.data
   | ^^^^^^^^^^^^^^^^^ AIR301
 28 | s3_convert_dataset_to_openlineage()
   |
-   = help: Use `create_asset` from `airflow.providers.amazon.aws.assets.s3` instead.
+   = help: Use `airflow.providers.amazon.aws.assets.s3.create_asset` instead

 ℹ Safe fix
 21 21 |     DatasetInfo,
@@ -54,7 +54,7 @@ AIR301_provider_names_fix.py:28:1: AIR301 [*] `airflow.providers.amazon.aws.data
 29 |
 30 | io_create_dataset()
   |
-   = help: Use `convert_asset_to_openlineage` from `airflow.providers.amazon.aws.assets.s3` instead.
+   = help: Use `airflow.providers.amazon.aws.assets.s3.convert_asset_to_openlineage` instead

 ℹ Safe fix
 21 21 |     DatasetInfo,
@@ -79,7 +79,7 @@ AIR301_provider_names_fix.py:36:1: AIR301 [*] `airflow.providers.google.datasets
 37 | # airflow.providers.google.datasets.gcs
 38 | gcs_create_dataset()
   |
-   = help: Use `create_asset` from `airflow.providers.google.assets.bigquery` instead.
+   = help: Use `airflow.providers.google.assets.bigquery.create_asset` instead

 ℹ Safe fix
 21 21 |     DatasetInfo,
@@ -108,7 +108,7 @@ AIR301_provider_names_fix.py:38:1: AIR301 [*] `airflow.providers.google.datasets
 39 | gcs_convert_dataset_to_openlineage()
 40 | # airflow.providers.openlineage.utils.utils
   |
-   = help: Use `create_asset` from `airflow.providers.google.assets.gcs` instead.
+   = help: Use `airflow.providers.google.assets.gcs.create_asset` instead

 ℹ Safe fix
 21 21 |     DatasetInfo,
@@ -137,7 +137,7 @@ AIR301_provider_names_fix.py:39:1: AIR301 [*] `airflow.providers.google.datasets
 40 | # airflow.providers.openlineage.utils.utils
 41 | DatasetInfo()
   |
-   = help: Use `convert_asset_to_openlineage` from `airflow.providers.google.assets.gcs` instead.
+   = help: Use `airflow.providers.google.assets.gcs.convert_asset_to_openlineage` instead

 ℹ Safe fix
 21 21 |     DatasetInfo,
@@ -166,7 +166,7 @@ AIR301_provider_names_fix.py:41:1: AIR301 [*] `airflow.providers.openlineage.uti
 42 | translate_airflow_dataset()
 43 | #
   |
-   = help: Use `AssetInfo` from `airflow.providers.openlineage.utils.utils` instead.
+   = help: Use `airflow.providers.openlineage.utils.utils.AssetInfo` instead

 ℹ Safe fix
 20 20 | from airflow.providers.openlineage.utils.utils import (
@@ -195,7 +195,7 @@ AIR301_provider_names_fix.py:42:1: AIR301 [*] `airflow.providers.openlineage.uti
 43 | #
 44 | # airflow.secrets.local_filesystem
   |
-   = help: Use `translate_airflow_asset` from `airflow.providers.openlineage.utils.utils` instead.
+   = help: Use `airflow.providers.openlineage.utils.utils.translate_airflow_asset` instead

 ℹ Safe fix
 20 20 | from airflow.providers.openlineage.utils.utils import (
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_amazon.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_amazon.py.snap
@@ -9,7 +9,7 @@ AIR302_amazon.py:23:1: AIR302 `airflow.hooks.S3_hook.S3Hook` is moved into `amaz
   | ^^^^^^ AIR302
 24 | provide_bucket_name()
   |
-   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `S3Hook` from `airflow.providers.amazon.aws.hooks.s3` instead.
+   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `airflow.providers.amazon.aws.hooks.s3.S3Hook` instead.

 AIR302_amazon.py:24:1: AIR302 `airflow.hooks.S3_hook.provide_bucket_name` is moved into `amazon` provider in Airflow 3.0;
   |
@@ -19,7 +19,7 @@ AIR302_amazon.py:24:1: AIR302 `airflow.hooks.S3_hook.provide_bucket_name` is mov
 25 |
 26 | GCSToS3Operator()
   |
-   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `provide_bucket_name` from `airflow.providers.amazon.aws.hooks.s3` instead.
+   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `airflow.providers.amazon.aws.hooks.s3.provide_bucket_name` instead.

 AIR302_amazon.py:26:1: AIR302 `airflow.operators.gcs_to_s3.GCSToS3Operator` is moved into `amazon` provider in Airflow 3.0;
   |
@@ -30,7 +30,7 @@ AIR302_amazon.py:26:1: AIR302 `airflow.operators.gcs_to_s3.GCSToS3Operator` is m
 27 |
 28 | GoogleApiToS3Operator()
   |
-   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `GCSToS3Operator` from `airflow.providers.amazon.aws.transfers.gcs_to_s3` instead.
+   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `airflow.providers.amazon.aws.transfers.gcs_to_s3.GCSToS3Operator` instead.

 AIR302_amazon.py:28:1: AIR302 `airflow.operators.google_api_to_s3_transfer.GoogleApiToS3Operator` is moved into `amazon` provider in Airflow 3.0;
   |
@@ -40,7 +40,7 @@ AIR302_amazon.py:28:1: AIR302 `airflow.operators.google_api_to_s3_transfer.Googl
   | ^^^^^^^^^^^^^^^^^^^^^ AIR302
 29 | GoogleApiToS3Transfer()
   |
-   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `GoogleApiToS3Operator` from `airflow.providers.amazon.aws.transfers.google_api_to_s3` instead.
+   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `airflow.providers.amazon.aws.transfers.google_api_to_s3.GoogleApiToS3Operator` instead.

 AIR302_amazon.py:29:1: AIR302 `airflow.operators.google_api_to_s3_transfer.GoogleApiToS3Transfer` is moved into `amazon` provider in Airflow 3.0;
   |
@@ -50,7 +50,7 @@ AIR302_amazon.py:29:1: AIR302 `airflow.operators.google_api_to_s3_transfer.Googl
 30 |
 31 | RedshiftToS3Operator()
   |
-   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `GoogleApiToS3Operator` from `airflow.providers.amazon.aws.transfers.google_api_to_s3` instead.
+   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `airflow.providers.amazon.aws.transfers.google_api_to_s3.GoogleApiToS3Operator` instead.

 AIR302_amazon.py:31:1: AIR302 `airflow.operators.redshift_to_s3_operator.RedshiftToS3Operator` is moved into `amazon` provider in Airflow 3.0;
   |
@@ -60,7 +60,7 @@ AIR302_amazon.py:31:1: AIR302 `airflow.operators.redshift_to_s3_operator.Redshif
   | ^^^^^^^^^^^^^^^^^^^^ AIR302
 32 | RedshiftToS3Transfer()
   |
-   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `RedshiftToS3Operator` from `airflow.providers.amazon.aws.transfers.redshift_to_s3` instead.
+   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `airflow.providers.amazon.aws.transfers.redshift_to_s3.RedshiftToS3Operator` instead.

 AIR302_amazon.py:32:1: AIR302 `airflow.operators.redshift_to_s3_operator.RedshiftToS3Transfer` is moved into `amazon` provider in Airflow 3.0;
   |
@@ -70,7 +70,7 @@ AIR302_amazon.py:32:1: AIR302 `airflow.operators.redshift_to_s3_operator.Redshif
 33 |
 34 | S3FileTransformOperator()
   |
-   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `RedshiftToS3Operator` from `airflow.providers.amazon.aws.transfers.redshift_to_s3` instead.
+   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `airflow.providers.amazon.aws.transfers.redshift_to_s3.RedshiftToS3Operator` instead.

 AIR302_amazon.py:34:1: AIR302 `airflow.operators.s3_file_transform_operator.S3FileTransformOperator` is moved into `amazon` provider in Airflow 3.0;
   |
@@ -81,7 +81,7 @@ AIR302_amazon.py:34:1: AIR302 `airflow.operators.s3_file_transform_operator.S3Fi
 35 |
 36 | S3ToRedshiftOperator()
   |
-   = help: Install `apache-airflow-providers-amazon>=3.0.0` and use `S3FileTransformOperator` from `airflow.providers.amazon.aws.operators.s3` instead.
+   = help: Install `apache-airflow-providers-amazon>=3.0.0` and use `airflow.providers.amazon.aws.operators.s3.S3FileTransformOperator` instead.

 AIR302_amazon.py:36:1: AIR302 `airflow.operators.s3_to_redshift_operator.S3ToRedshiftOperator` is moved into `amazon` provider in Airflow 3.0;
   |
@@ -91,7 +91,7 @@ AIR302_amazon.py:36:1: AIR302 `airflow.operators.s3_to_redshift_operator.S3ToRed
   | ^^^^^^^^^^^^^^^^^^^^ AIR302
 37 | S3ToRedshiftTransfer()
   |
-   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `S3ToRedshiftOperator` from `airflow.providers.amazon.aws.transfers.s3_to_redshift` instead.
+   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `airflow.providers.amazon.aws.transfers.s3_to_redshift.S3ToRedshiftOperator` instead.

 AIR302_amazon.py:37:1: AIR302 `airflow.operators.s3_to_redshift_operator.S3ToRedshiftTransfer` is moved into `amazon` provider in Airflow 3.0;
   |
@@ -101,7 +101,7 @@ AIR302_amazon.py:37:1: AIR302 `airflow.operators.s3_to_redshift_operator.S3ToRed
 38 |
 39 | S3KeySensor()
   |
-   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `S3ToRedshiftOperator` from `airflow.providers.amazon.aws.transfers.s3_to_redshift` instead.
+   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `airflow.providers.amazon.aws.transfers.s3_to_redshift.S3ToRedshiftOperator` instead.

 AIR302_amazon.py:39:1: AIR302 `airflow.sensors.s3_key_sensor.S3KeySensor` is moved into `amazon` provider in Airflow 3.0;
   |
@@ -110,4 +110,4 @@ AIR302_amazon.py:39:1: AIR302 `airflow.sensors.s3_key_sensor.S3KeySensor` is mov
 39 | S3KeySensor()
   | ^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `S3KeySensor` from `airflow.providers.amazon.aws.sensors.s3` instead.
+   = help: Install `apache-airflow-providers-amazon>=1.0.0` and use `airflow.providers.amazon.aws.sensors.s3.S3KeySensor` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_celery.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_celery.py.snap
@@ -10,7 +10,7 @@ AIR302_celery.py:9:1: AIR302 `airflow.config_templates.default_celery.DEFAULT_CE
 10 |
 11 | app
   |
-   = help: Install `apache-airflow-providers-celery>=3.3.0` and use `DEFAULT_CELERY_CONFIG` from `airflow.providers.celery.executors.default_celery` instead.
+   = help: Install `apache-airflow-providers-celery>=3.3.0` and use `airflow.providers.celery.executors.default_celery.DEFAULT_CELERY_CONFIG` instead.

 AIR302_celery.py:11:1: AIR302 `airflow.executors.celery_executor.app` is moved into `celery` provider in Airflow 3.0;
   |
@@ -20,7 +20,7 @@ AIR302_celery.py:11:1: AIR302 `airflow.executors.celery_executor.app` is moved i
   | ^^^ AIR302
 12 | CeleryExecutor()
   |
-   = help: Install `apache-airflow-providers-celery>=3.3.0` and use `app` from `airflow.providers.celery.executors.celery_executor_utils` instead.
+   = help: Install `apache-airflow-providers-celery>=3.3.0` and use `airflow.providers.celery.executors.celery_executor_utils.app` instead.

 AIR302_celery.py:12:1: AIR302 `airflow.executors.celery_executor.CeleryExecutor` is moved into `celery` provider in Airflow 3.0;
   |
@@ -28,4 +28,4 @@ AIR302_celery.py:12:1: AIR302 `airflow.executors.celery_executor.CeleryExecutor`
 12 | CeleryExecutor()
   | ^^^^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-celery>=3.3.0` and use `CeleryExecutor` from `airflow.providers.celery.executors.celery_executor` instead.
+   = help: Install `apache-airflow-providers-celery>=3.3.0` and use `airflow.providers.celery.executors.celery_executor.CeleryExecutor` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_common_sql.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_common_sql.py.snap
@@ -10,7 +10,7 @@ AIR302_common_sql.py:10:1: AIR302 `airflow.hooks.dbapi.ConnectorProtocol` is mov
 11 | DbApiHook()
 12 | SQLCheckOperator()
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `ConnectorProtocol` from `airflow.providers.common.sql.hooks.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `airflow.providers.common.sql.hooks.sql.ConnectorProtocol` instead.

 AIR302_common_sql.py:11:1: AIR302 `airflow.hooks.dbapi_hook.DbApiHook` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -19,7 +19,7 @@ AIR302_common_sql.py:11:1: AIR302 `airflow.hooks.dbapi_hook.DbApiHook` is moved
   | ^^^^^^^^^ AIR302
 12 | SQLCheckOperator()
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `DbApiHook` from `airflow.providers.common.sql.hooks.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `airflow.providers.common.sql.hooks.sql.DbApiHook` instead.

 AIR302_common_sql.py:12:1: AIR302 `airflow.operators.check_operator.SQLCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -28,7 +28,7 @@ AIR302_common_sql.py:12:1: AIR302 `airflow.operators.check_operator.SQLCheckOper
 12 | SQLCheckOperator()
   | ^^^^^^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLCheckOperator` instead.

 AIR302_common_sql.py:18:1: AIR302 `airflow.operators.sql.SQLCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -38,7 +38,7 @@ AIR302_common_sql.py:18:1: AIR302 `airflow.operators.sql.SQLCheckOperator` is mo
   | ^^^^^^^^^^^^^^^^ AIR302
 19 | CheckOperator()
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLCheckOperator` instead.

 AIR302_common_sql.py:19:1: AIR302 `airflow.operators.check_operator.CheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -46,7 +46,7 @@ AIR302_common_sql.py:19:1: AIR302 `airflow.operators.check_operator.CheckOperato
 19 | CheckOperator()
   | ^^^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLCheckOperator` instead.

 AIR302_common_sql.py:24:1: AIR302 `airflow.operators.druid_check_operator.CheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -55,7 +55,7 @@ AIR302_common_sql.py:24:1: AIR302 `airflow.operators.druid_check_operator.CheckO
 24 | CheckOperator()
   | ^^^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLCheckOperator` instead.

 AIR302_common_sql.py:29:1: AIR302 `airflow.operators.presto_check_operator.CheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -64,7 +64,7 @@ AIR302_common_sql.py:29:1: AIR302 `airflow.operators.presto_check_operator.Check
 29 | CheckOperator()
   | ^^^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLCheckOperator` instead.

 AIR302_common_sql.py:39:1: AIR302 `airflow.operators.druid_check_operator.DruidCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -75,7 +75,7 @@ AIR302_common_sql.py:39:1: AIR302 `airflow.operators.druid_check_operator.DruidC
 40 | PrestoCheckOperator()
 41 | IntervalCheckOperator()
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLCheckOperator` instead.

 AIR302_common_sql.py:40:1: AIR302 `airflow.operators.presto_check_operator.PrestoCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -85,7 +85,7 @@ AIR302_common_sql.py:40:1: AIR302 `airflow.operators.presto_check_operator.Prest
 41 | IntervalCheckOperator()
 42 | SQLIntervalCheckOperator()
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLCheckOperator` instead.

 AIR302_common_sql.py:41:1: AIR302 `airflow.operators.check_operator.IntervalCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -95,7 +95,7 @@ AIR302_common_sql.py:41:1: AIR302 `airflow.operators.check_operator.IntervalChec
   | ^^^^^^^^^^^^^^^^^^^^^ AIR302
 42 | SQLIntervalCheckOperator()
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLIntervalCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLIntervalCheckOperator` instead.

 AIR302_common_sql.py:42:1: AIR302 `airflow.operators.check_operator.SQLIntervalCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -104,7 +104,7 @@ AIR302_common_sql.py:42:1: AIR302 `airflow.operators.check_operator.SQLIntervalC
 42 | SQLIntervalCheckOperator()
   | ^^^^^^^^^^^^^^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLIntervalCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLIntervalCheckOperator` instead.

 AIR302_common_sql.py:51:1: AIR302 `airflow.operators.presto_check_operator.IntervalCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -115,7 +115,7 @@ AIR302_common_sql.py:51:1: AIR302 `airflow.operators.presto_check_operator.Inter
 52 | SQLIntervalCheckOperator()
 53 | PrestoIntervalCheckOperator()
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLIntervalCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLIntervalCheckOperator` instead.

 AIR302_common_sql.py:52:1: AIR302 `airflow.operators.sql.SQLIntervalCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -124,7 +124,7 @@ AIR302_common_sql.py:52:1: AIR302 `airflow.operators.sql.SQLIntervalCheckOperato
   | ^^^^^^^^^^^^^^^^^^^^^^^^ AIR302
 53 | PrestoIntervalCheckOperator()
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLIntervalCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLIntervalCheckOperator` instead.

 AIR302_common_sql.py:53:1: AIR302 `airflow.operators.presto_check_operator.PrestoIntervalCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -133,7 +133,7 @@ AIR302_common_sql.py:53:1: AIR302 `airflow.operators.presto_check_operator.Prest
 53 | PrestoIntervalCheckOperator()
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLIntervalCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLIntervalCheckOperator` instead.

 AIR302_common_sql.py:61:1: AIR302 `airflow.operators.check_operator.SQLThresholdCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -143,7 +143,7 @@ AIR302_common_sql.py:61:1: AIR302 `airflow.operators.check_operator.SQLThreshold
   | ^^^^^^^^^^^^^^^^^^^^^^^^^ AIR302
 62 | ThresholdCheckOperator()
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLThresholdCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLThresholdCheckOperator` instead.

 AIR302_common_sql.py:62:1: AIR302 `airflow.operators.check_operator.ThresholdCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -151,7 +151,7 @@ AIR302_common_sql.py:62:1: AIR302 `airflow.operators.check_operator.ThresholdChe
 62 | ThresholdCheckOperator()
   | ^^^^^^^^^^^^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLThresholdCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLThresholdCheckOperator` instead.

 AIR302_common_sql.py:67:1: AIR302 `airflow.operators.sql.SQLThresholdCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -160,7 +160,7 @@ AIR302_common_sql.py:67:1: AIR302 `airflow.operators.sql.SQLThresholdCheckOperat
 67 | SQLThresholdCheckOperator()
   | ^^^^^^^^^^^^^^^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLThresholdCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLThresholdCheckOperator` instead.

 AIR302_common_sql.py:75:1: AIR302 `airflow.operators.check_operator.SQLValueCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -170,7 +170,7 @@ AIR302_common_sql.py:75:1: AIR302 `airflow.operators.check_operator.SQLValueChec
   | ^^^^^^^^^^^^^^^^^^^^^ AIR302
 76 | ValueCheckOperator()
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLValueCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLValueCheckOperator` instead.

 AIR302_common_sql.py:76:1: AIR302 `airflow.operators.check_operator.ValueCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -178,7 +178,7 @@ AIR302_common_sql.py:76:1: AIR302 `airflow.operators.check_operator.ValueCheckOp
 76 | ValueCheckOperator()
   | ^^^^^^^^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLValueCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLValueCheckOperator` instead.

 AIR302_common_sql.py:85:1: AIR302 `airflow.operators.sql.SQLValueCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -189,7 +189,7 @@ AIR302_common_sql.py:85:1: AIR302 `airflow.operators.sql.SQLValueCheckOperator`
 86 | ValueCheckOperator()
 87 | PrestoValueCheckOperator()
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLValueCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLValueCheckOperator` instead.

 AIR302_common_sql.py:86:1: AIR302 `airflow.operators.presto_check_operator.ValueCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -198,7 +198,7 @@ AIR302_common_sql.py:86:1: AIR302 `airflow.operators.presto_check_operator.Value
   | ^^^^^^^^^^^^^^^^^^ AIR302
 87 | PrestoValueCheckOperator()
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLValueCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLValueCheckOperator` instead.

 AIR302_common_sql.py:87:1: AIR302 `airflow.operators.presto_check_operator.PrestoValueCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
   |
@@ -207,7 +207,7 @@ AIR302_common_sql.py:87:1: AIR302 `airflow.operators.presto_check_operator.Prest
 87 | PrestoValueCheckOperator()
   | ^^^^^^^^^^^^^^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLValueCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+   = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLValueCheckOperator` instead.

 AIR302_common_sql.py:99:1: AIR302 `airflow.operators.sql.BaseSQLOperator` is moved into `common-sql` provider in Airflow 3.0;
    |
@@ -218,7 +218,7 @@ AIR302_common_sql.py:99:1: AIR302 `airflow.operators.sql.BaseSQLOperator` is mov
 100 | BranchSQLOperator()
 101 | SQLTableCheckOperator()
    |
-    = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `BaseSQLOperator` from `airflow.providers.common.sql.operators.sql` instead.
+    = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.BaseSQLOperator` instead.

 AIR302_common_sql.py:100:1: AIR302 `airflow.operators.sql.BranchSQLOperator` is moved into `common-sql` provider in Airflow 3.0;
    |
@@ -228,7 +228,7 @@ AIR302_common_sql.py:100:1: AIR302 `airflow.operators.sql.BranchSQLOperator` is
 101 | SQLTableCheckOperator()
 102 | SQLColumnCheckOperator()
    |
-    = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `BranchSQLOperator` from `airflow.providers.common.sql.operators.sql` instead.
+    = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.BranchSQLOperator` instead.

 AIR302_common_sql.py:101:1: AIR302 `airflow.operators.sql.SQLTableCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
    |
@@ -239,7 +239,7 @@ AIR302_common_sql.py:101:1: AIR302 `airflow.operators.sql.SQLTableCheckOperator`
 102 | SQLColumnCheckOperator()
 103 | _convert_to_float_if_possible()
    |
-    = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `SQLTableCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+    = help: Install `apache-airflow-providers-common-sql>=1.1.0` and use `airflow.providers.common.sql.operators.sql.SQLTableCheckOperator` instead.

 AIR302_common_sql.py:102:1: AIR302 `airflow.operators.sql.SQLColumnCheckOperator` is moved into `common-sql` provider in Airflow 3.0;
    |
@@ -250,7 +250,7 @@ AIR302_common_sql.py:102:1: AIR302 `airflow.operators.sql.SQLColumnCheckOperator
 103 | _convert_to_float_if_possible()
 104 | parse_boolean()
    |
-    = help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `SQLColumnCheckOperator` from `airflow.providers.common.sql.operators.sql` instead.
+    = help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `airflow.providers.common.sql.operators.sql.SQLColumnCheckOperator` instead.

 AIR302_common_sql.py:103:1: AIR302 `airflow.operators.sql._convert_to_float_if_possible` is moved into `common-sql` provider in Airflow 3.0;
    |
@@ -260,7 +260,7 @@ AIR302_common_sql.py:103:1: AIR302 `airflow.operators.sql._convert_to_float_if_p
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AIR302
 104 | parse_boolean()
    |
-    = help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `_convert_to_float_if_possible` from `airflow.providers.common.sql.operators.sql` instead.
+    = help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `airflow.providers.common.sql.operators.sql._convert_to_float_if_possible` instead.

 AIR302_common_sql.py:104:1: AIR302 `airflow.operators.sql.parse_boolean` is moved into `common-sql` provider in Airflow 3.0;
    |
@@ -269,7 +269,7 @@ AIR302_common_sql.py:104:1: AIR302 `airflow.operators.sql.parse_boolean` is move
 104 | parse_boolean()
    | ^^^^^^^^^^^^^ AIR302
    |
-    = help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `parse_boolean` from `airflow.providers.common.sql.operators.sql` instead.
+    = help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `airflow.providers.common.sql.operators.sql.parse_boolean` instead.

 AIR302_common_sql.py:109:1: AIR302 `airflow.sensors.sql.SqlSensor` is moved into `common-sql` provider in Airflow 3.0;
    |
@@ -278,7 +278,7 @@ AIR302_common_sql.py:109:1: AIR302 `airflow.sensors.sql.SqlSensor` is moved into
 109 | SqlSensor()
    | ^^^^^^^^^ AIR302
    |
-    = help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `SqlSensor` from `airflow.providers.common.sql.sensors.sql` instead.
+    = help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `airflow.providers.common.sql.sensors.sql.SqlSensor` instead.

 AIR302_common_sql.py:114:1: AIR302 `airflow.sensors.sql_sensor.SqlSensor` is moved into `common-sql` provider in Airflow 3.0;
    |
@@ -287,4 +287,147 @@ AIR302_common_sql.py:114:1: AIR302 `airflow.sensors.sql_sensor.SqlSensor` is mov
 114 | SqlSensor()
    | ^^^^^^^^^ AIR302
    |
-    = help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `SqlSensor` from `airflow.providers.common.sql.sensors.sql` instead.
+    = help: Install `apache-airflow-providers-common-sql>=1.0.0` and use `airflow.providers.common.sql.sensors.sql.SqlSensor` instead.
+
+AIR302_common_sql.py:124:1: AIR302 [*] `airflow.operators.jdbc_operator.JdbcOperator` is moved into `common-sql` provider in Airflow 3.0;
+    |
+122 | from airflow.operators.sqlite_operator import SqliteOperator
+123 |
+124 | JdbcOperator()
+    | ^^^^^^^^^^^^ AIR302
+125 | MsSqlOperator()
+126 | MySqlOperator()
+    |
+    = help: Install `apache-airflow-providers-common-sql>=1.3.0` and use `airflow.providers.common.sql.operators.sql.SQLExecuteQueryOperator` instead.
+
+ℹ Safe fix
+120 120 | from airflow.operators.oracle_operator import OracleOperator
+121 121 | from airflow.operators.postgres_operator import PostgresOperator
+122 122 | from airflow.operators.sqlite_operator import SqliteOperator
+    123 |+from airflow.providers.common.sql.operators.sql import SQLExecuteQueryOperator
+123 124 | 
+124     |-JdbcOperator()
+    125 |+SQLExecuteQueryOperator()
+125 126 | MsSqlOperator()
+126 127 | MySqlOperator()
+127 128 | OracleOperator()
+
+AIR302_common_sql.py:125:1: AIR302 [*] `airflow.operators.mssql_operator.MsSqlOperator` is moved into `common-sql` provider in Airflow 3.0;
+    |
+124 | JdbcOperator()
+125 | MsSqlOperator()
+    | ^^^^^^^^^^^^^ AIR302
+126 | MySqlOperator()
+127 | OracleOperator()
+    |
+    = help: Install `apache-airflow-providers-common-sql>=1.3.0` and use `airflow.providers.common.sql.operators.sql.SQLExecuteQueryOperator` instead.
+
+ℹ Safe fix
+120 120 | from airflow.operators.oracle_operator import OracleOperator
+121 121 | from airflow.operators.postgres_operator import PostgresOperator
+122 122 | from airflow.operators.sqlite_operator import SqliteOperator
+    123 |+from airflow.providers.common.sql.operators.sql import SQLExecuteQueryOperator
+123 124 | 
+124 125 | JdbcOperator()
+125     |-MsSqlOperator()
+    126 |+SQLExecuteQueryOperator()
+126 127 | MySqlOperator()
+127 128 | OracleOperator()
+128 129 | PostgresOperator()
+
+AIR302_common_sql.py:126:1: AIR302 [*] `airflow.operators.mysql_operator.MySqlOperator` is moved into `common-sql` provider in Airflow 3.0;
+    |
+124 | JdbcOperator()
+125 | MsSqlOperator()
+126 | MySqlOperator()
+    | ^^^^^^^^^^^^^ AIR302
+127 | OracleOperator()
+128 | PostgresOperator()
+    |
+    = help: Install `apache-airflow-providers-common-sql>=1.3.0` and use `airflow.providers.common.sql.operators.sql.SQLExecuteQueryOperator` instead.
+
+ℹ Safe fix
+120 120 | from airflow.operators.oracle_operator import OracleOperator
+121 121 | from airflow.operators.postgres_operator import PostgresOperator
+122 122 | from airflow.operators.sqlite_operator import SqliteOperator
+    123 |+from airflow.providers.common.sql.operators.sql import SQLExecuteQueryOperator
+123 124 | 
+124 125 | JdbcOperator()
+125 126 | MsSqlOperator()
+126     |-MySqlOperator()
+    127 |+SQLExecuteQueryOperator()
+127 128 | OracleOperator()
+128 129 | PostgresOperator()
+129 130 | SqliteOperator()
+
+AIR302_common_sql.py:127:1: AIR302 [*] `airflow.operators.oracle_operator.OracleOperator` is moved into `common-sql` provider in Airflow 3.0;
+    |
+125 | MsSqlOperator()
+126 | MySqlOperator()
+127 | OracleOperator()
+    | ^^^^^^^^^^^^^^ AIR302
+128 | PostgresOperator()
+129 | SqliteOperator()
+    |
+    = help: Install `apache-airflow-providers-common-sql>=1.3.0` and use `airflow.providers.common.sql.operators.sql.SQLExecuteQueryOperator` instead.
+
+ℹ Safe fix
+120 120 | from airflow.operators.oracle_operator import OracleOperator
+121 121 | from airflow.operators.postgres_operator import PostgresOperator
+122 122 | from airflow.operators.sqlite_operator import SqliteOperator
+    123 |+from airflow.providers.common.sql.operators.sql import SQLExecuteQueryOperator
+123 124 | 
+124 125 | JdbcOperator()
+125 126 | MsSqlOperator()
+126 127 | MySqlOperator()
+127     |-OracleOperator()
+    128 |+SQLExecuteQueryOperator()
+128 129 | PostgresOperator()
+129 130 | SqliteOperator()
+
+AIR302_common_sql.py:128:1: AIR302 [*] `airflow.operators.postgres_operator.PostgresOperator` is moved into `common-sql` provider in Airflow 3.0;
+    |
+126 | MySqlOperator()
+127 | OracleOperator()
+128 | PostgresOperator()
+    | ^^^^^^^^^^^^^^^^ AIR302
+129 | SqliteOperator()
+    |
+    = help: Install `apache-airflow-providers-common-sql>=1.3.0` and use `airflow.providers.common.sql.operators.sql.SQLExecuteQueryOperator` instead.
+
+ℹ Safe fix
+120 120 | from airflow.operators.oracle_operator import OracleOperator
+121 121 | from airflow.operators.postgres_operator import PostgresOperator
+122 122 | from airflow.operators.sqlite_operator import SqliteOperator
+    123 |+from airflow.providers.common.sql.operators.sql import SQLExecuteQueryOperator
+123 124 | 
+124 125 | JdbcOperator()
+125 126 | MsSqlOperator()
+126 127 | MySqlOperator()
+127 128 | OracleOperator()
+128     |-PostgresOperator()
+    129 |+SQLExecuteQueryOperator()
+129 130 | SqliteOperator()
+
+AIR302_common_sql.py:129:1: AIR302 [*] `airflow.operators.sqlite_operator.SqliteOperator` is moved into `common-sql` provider in Airflow 3.0;
+    |
+127 | OracleOperator()
+128 | PostgresOperator()
+129 | SqliteOperator()
+    | ^^^^^^^^^^^^^^ AIR302
+    |
+    = help: Install `apache-airflow-providers-common-sql>=1.3.0` and use `airflow.providers.common.sql.operators.sql.SQLExecuteQueryOperator` instead.
+
+ℹ Safe fix
+120 120 | from airflow.operators.oracle_operator import OracleOperator
+121 121 | from airflow.operators.postgres_operator import PostgresOperator
+122 122 | from airflow.operators.sqlite_operator import SqliteOperator
+    123 |+from airflow.providers.common.sql.operators.sql import SQLExecuteQueryOperator
+123 124 | 
+124 125 | JdbcOperator()
+125 126 | MsSqlOperator()
+126 127 | MySqlOperator()
+127 128 | OracleOperator()
+128 129 | PostgresOperator()
+129     |-SqliteOperator()
+    130 |+SQLExecuteQueryOperator()
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_daskexecutor.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_daskexecutor.py.snap
@@ -8,4 +8,4 @@ AIR302_daskexecutor.py:5:1: AIR302 `airflow.executors.dask_executor.DaskExecutor
 5 | DaskExecutor()
  | ^^^^^^^^^^^^ AIR302
  |
-  = help: Install `apache-airflow-providers-daskexecutor>=1.0.0` and use `DaskExecutor` from `airflow.providers.daskexecutor.executors.dask_executor` instead.
+  = help: Install `apache-airflow-providers-daskexecutor>=1.0.0` and use `airflow.providers.daskexecutor.executors.dask_executor.DaskExecutor` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_druid.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_druid.py.snap
@@ -9,7 +9,7 @@ AIR302_druid.py:12:1: AIR302 `airflow.hooks.druid_hook.DruidDbApiHook` is moved
   | ^^^^^^^^^^^^^^ AIR302
 13 | DruidHook()
   |
-   = help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `DruidDbApiHook` from `airflow.providers.apache.druid.hooks.druid` instead.
+   = help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `airflow.providers.apache.druid.hooks.druid.DruidDbApiHook` instead.

 AIR302_druid.py:13:1: AIR302 `airflow.hooks.druid_hook.DruidHook` is moved into `apache-druid` provider in Airflow 3.0;
   |
@@ -19,7 +19,7 @@ AIR302_druid.py:13:1: AIR302 `airflow.hooks.druid_hook.DruidHook` is moved into
 14 |
 15 | HiveToDruidOperator()
   |
-   = help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `DruidHook` from `airflow.providers.apache.druid.hooks.druid` instead.
+   = help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `airflow.providers.apache.druid.hooks.druid.DruidHook` instead.

 AIR302_druid.py:15:1: AIR302 `airflow.operators.hive_to_druid.HiveToDruidOperator` is moved into `apache-druid` provider in Airflow 3.0;
   |
@@ -29,7 +29,7 @@ AIR302_druid.py:15:1: AIR302 `airflow.operators.hive_to_druid.HiveToDruidOperato
   | ^^^^^^^^^^^^^^^^^^^ AIR302
 16 | HiveToDruidTransfer()
   |
-   = help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `HiveToDruidOperator` from `airflow.providers.apache.druid.transfers.hive_to_druid` instead.
+   = help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `airflow.providers.apache.druid.transfers.hive_to_druid.HiveToDruidOperator` instead.

 AIR302_druid.py:16:1: AIR302 `airflow.operators.hive_to_druid.HiveToDruidTransfer` is moved into `apache-druid` provider in Airflow 3.0;
   |
@@ -37,4 +37,4 @@ AIR302_druid.py:16:1: AIR302 `airflow.operators.hive_to_druid.HiveToDruidTransfe
 16 | HiveToDruidTransfer()
   | ^^^^^^^^^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `HiveToDruidOperator` from `airflow.providers.apache.druid.transfers.hive_to_druid` instead.
+   = help: Install `apache-airflow-providers-apache-druid>=1.0.0` and use `airflow.providers.apache.druid.transfers.hive_to_druid.HiveToDruidOperator` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_fab.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_fab.py.snap
@@ -10,7 +10,7 @@ AIR302_fab.py:10:1: AIR302 `airflow.api.auth.backend.basic_auth.CLIENT_AUTH` is
 11 | init_app()
 12 | auth_current_user()
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `CLIENT_AUTH` from `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth.CLIENT_AUTH` instead.

 AIR302_fab.py:11:1: AIR302 `airflow.api.auth.backend.basic_auth.init_app` is moved into `fab` provider in Airflow 3.0;
   |
@@ -20,7 +20,7 @@ AIR302_fab.py:11:1: AIR302 `airflow.api.auth.backend.basic_auth.init_app` is mov
 12 | auth_current_user()
 13 | requires_authentication()
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `init_app` from `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth.init_app` instead.

 AIR302_fab.py:12:1: AIR302 `airflow.api.auth.backend.basic_auth.auth_current_user` is moved into `fab` provider in Airflow 3.0;
   |
@@ -30,7 +30,7 @@ AIR302_fab.py:12:1: AIR302 `airflow.api.auth.backend.basic_auth.auth_current_use
   | ^^^^^^^^^^^^^^^^^ AIR302
 13 | requires_authentication()
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `auth_current_user` from `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth.auth_current_user` instead.

 AIR302_fab.py:13:1: AIR302 `airflow.api.auth.backend.basic_auth.requires_authentication` is moved into `fab` provider in Airflow 3.0;
   |
@@ -41,7 +41,7 @@ AIR302_fab.py:13:1: AIR302 `airflow.api.auth.backend.basic_auth.requires_authent
 14 |
 15 | from airflow.api.auth.backend.kerberos_auth import (
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `requires_authentication` from `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.api.auth.backend.basic_auth.requires_authentication` instead.

 AIR302_fab.py:23:1: AIR302 `airflow.api.auth.backend.kerberos_auth.log` is moved into `fab` provider in Airflow 3.0;
   |
@@ -52,7 +52,7 @@ AIR302_fab.py:23:1: AIR302 `airflow.api.auth.backend.kerberos_auth.log` is moved
 24 | CLIENT_AUTH
 25 | find_user()
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `log` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth.log` instead.

 AIR302_fab.py:24:1: AIR302 `airflow.api.auth.backend.kerberos_auth.CLIENT_AUTH` is moved into `fab` provider in Airflow 3.0;
   |
@@ -62,7 +62,7 @@ AIR302_fab.py:24:1: AIR302 `airflow.api.auth.backend.kerberos_auth.CLIENT_AUTH`
 25 | find_user()
 26 | init_app()
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `CLIENT_AUTH` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth.CLIENT_AUTH` instead.

 AIR302_fab.py:25:1: AIR302 `airflow.api.auth.backend.kerberos_auth.find_user` is moved into `fab` provider in Airflow 3.0;
   |
@@ -73,7 +73,7 @@ AIR302_fab.py:25:1: AIR302 `airflow.api.auth.backend.kerberos_auth.find_user` is
 26 | init_app()
 27 | requires_authentication()
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `find_user` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth.find_user` instead.

 AIR302_fab.py:26:1: AIR302 `airflow.api.auth.backend.kerberos_auth.init_app` is moved into `fab` provider in Airflow 3.0;
   |
@@ -83,7 +83,7 @@ AIR302_fab.py:26:1: AIR302 `airflow.api.auth.backend.kerberos_auth.init_app` is
   | ^^^^^^^^ AIR302
 27 | requires_authentication()
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `init_app` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth.init_app` instead.

 AIR302_fab.py:27:1: AIR302 `airflow.api.auth.backend.kerberos_auth.requires_authentication` is moved into `fab` provider in Airflow 3.0;
   |
@@ -94,7 +94,7 @@ AIR302_fab.py:27:1: AIR302 `airflow.api.auth.backend.kerberos_auth.requires_auth
 28 |
 29 | from airflow.auth.managers.fab.api.auth.backend.kerberos_auth import (
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `requires_authentication` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth.requires_authentication` instead.

 AIR302_fab.py:37:1: AIR302 `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.log` is moved into `fab` provider in Airflow 3.0;
   |
@@ -105,7 +105,7 @@ AIR302_fab.py:37:1: AIR302 `airflow.auth.managers.fab.api.auth.backend.kerberos_
 38 | CLIENT_AUTH
 39 | find_user()
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `log` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth.log` instead.

 AIR302_fab.py:38:1: AIR302 `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.CLIENT_AUTH` is moved into `fab` provider in Airflow 3.0;
   |
@@ -115,7 +115,7 @@ AIR302_fab.py:38:1: AIR302 `airflow.auth.managers.fab.api.auth.backend.kerberos_
 39 | find_user()
 40 | init_app()
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `CLIENT_AUTH` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth.CLIENT_AUTH` instead.

 AIR302_fab.py:39:1: AIR302 `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.find_user` is moved into `fab` provider in Airflow 3.0;
   |
@@ -126,7 +126,7 @@ AIR302_fab.py:39:1: AIR302 `airflow.auth.managers.fab.api.auth.backend.kerberos_
 40 | init_app()
 41 | requires_authentication()
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `find_user` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth.find_user` instead.

 AIR302_fab.py:40:1: AIR302 `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.init_app` is moved into `fab` provider in Airflow 3.0;
   |
@@ -136,7 +136,7 @@ AIR302_fab.py:40:1: AIR302 `airflow.auth.managers.fab.api.auth.backend.kerberos_
   | ^^^^^^^^ AIR302
 41 | requires_authentication()
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `init_app` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth.init_app` instead.

 AIR302_fab.py:41:1: AIR302 `airflow.auth.managers.fab.api.auth.backend.kerberos_auth.requires_authentication` is moved into `fab` provider in Airflow 3.0;
   |
@@ -147,7 +147,7 @@ AIR302_fab.py:41:1: AIR302 `airflow.auth.managers.fab.api.auth.backend.kerberos_
 42 |
 43 | from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `requires_authentication` from `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth.requires_authentication` instead.

 AIR302_fab.py:49:1: AIR302 `airflow.auth.managers.fab.fab_auth_manager.FabAuthManager` is moved into `fab` provider in Airflow 3.0;
   |
@@ -158,7 +158,7 @@ AIR302_fab.py:49:1: AIR302 `airflow.auth.managers.fab.fab_auth_manager.FabAuthMa
 50 | MAX_NUM_DATABASE_USER_SESSIONS
 51 | FabAirflowSecurityManagerOverride()
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `FabAuthManager` from `airflow.providers.fab.auth_manager.fab_auth_manager` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.fab_auth_manager.FabAuthManager` instead.

 AIR302_fab.py:50:1: AIR302 `airflow.auth.managers.fab.security_manager.override.MAX_NUM_DATABASE_USER_SESSIONS` is moved into `fab` provider in Airflow 3.0;
   |
@@ -167,7 +167,7 @@ AIR302_fab.py:50:1: AIR302 `airflow.auth.managers.fab.security_manager.override.
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AIR302
 51 | FabAirflowSecurityManagerOverride()
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `MAX_NUM_DATABASE_USER_SESSIONS` from `airflow.providers.fab.auth_manager.security_manager.override` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.security_manager.override.MAX_NUM_DATABASE_USER_SESSIONS` instead.

 AIR302_fab.py:51:1: AIR302 `airflow.auth.managers.fab.security_manager.override.FabAirflowSecurityManagerOverride` is moved into `fab` provider in Airflow 3.0;
   |
@@ -178,7 +178,7 @@ AIR302_fab.py:51:1: AIR302 `airflow.auth.managers.fab.security_manager.override.
 52 |
 53 | from airflow.www.security import FabAirflowSecurityManagerOverride
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `FabAirflowSecurityManagerOverride` from `airflow.providers.fab.auth_manager.security_manager.override` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.security_manager.override.FabAirflowSecurityManagerOverride` instead.

 AIR302_fab.py:55:1: AIR302 `airflow.www.security.FabAirflowSecurityManagerOverride` is moved into `fab` provider in Airflow 3.0;
   |
@@ -187,4 +187,4 @@ AIR302_fab.py:55:1: AIR302 `airflow.www.security.FabAirflowSecurityManagerOverri
 55 | FabAirflowSecurityManagerOverride()
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `FabAirflowSecurityManagerOverride` from `airflow.providers.fab.auth_manager.security_manager.override` instead.
+   = help: Install `apache-airflow-providers-fab>=1.0.0` and use `airflow.providers.fab.auth_manager.security_manager.override.FabAirflowSecurityManagerOverride` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_hdfs.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_hdfs.py.snap
@@ -9,7 +9,7 @@ AIR302_hdfs.py:6:1: AIR302 `airflow.hooks.webhdfs_hook.WebHDFSHook` is moved int
  | ^^^^^^^^^^^ AIR302
 7 | WebHdfsSensor()
  |
-  = help: Install `apache-airflow-providers-apache-hdfs>=1.0.0` and use `WebHDFSHook` from `airflow.providers.apache.hdfs.hooks.webhdfs` instead.
+  = help: Install `apache-airflow-providers-apache-hdfs>=1.0.0` and use `airflow.providers.apache.hdfs.hooks.webhdfs.WebHDFSHook` instead.

 AIR302_hdfs.py:7:1: AIR302 `airflow.sensors.web_hdfs_sensor.WebHdfsSensor` is moved into `apache-hdfs` provider in Airflow 3.0;
  |
@@ -17,4 +17,4 @@ AIR302_hdfs.py:7:1: AIR302 `airflow.sensors.web_hdfs_sensor.WebHdfsSensor` is mo
 7 | WebHdfsSensor()
  | ^^^^^^^^^^^^^ AIR302
  |
-  = help: Install `apache-airflow-providers-apache-hdfs>=1.0.0` and use `WebHdfsSensor` from `airflow.providers.apache.hdfs.sensors.web_hdfs` instead.
+  = help: Install `apache-airflow-providers-apache-hdfs>=1.0.0` and use `airflow.providers.apache.hdfs.sensors.web_hdfs.WebHdfsSensor` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_hive.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_hive.py.snap
@@ -9,7 +9,7 @@ AIR302_hive.py:36:1: AIR302 `airflow.macros.hive.closest_ds_partition` is moved
   | ^^^^^^^^^^^^^^^^^^^^ AIR302
 37 | max_partition()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=5.1.0` and use `closest_ds_partition` from `airflow.providers.apache.hive.macros.hive` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=5.1.0` and use `airflow.providers.apache.hive.macros.hive.closest_ds_partition` instead.

 AIR302_hive.py:37:1: AIR302 `airflow.macros.hive.max_partition` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -19,7 +19,7 @@ AIR302_hive.py:37:1: AIR302 `airflow.macros.hive.max_partition` is moved into `a
 38 |
 39 | HiveCliHook()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=5.1.0` and use `max_partition` from `airflow.providers.apache.hive.macros.hive` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=5.1.0` and use `airflow.providers.apache.hive.macros.hive.max_partition` instead.

 AIR302_hive.py:39:1: AIR302 `airflow.hooks.hive_hooks.HiveCliHook` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -30,7 +30,7 @@ AIR302_hive.py:39:1: AIR302 `airflow.hooks.hive_hooks.HiveCliHook` is moved into
 40 | HiveMetastoreHook()
 41 | HiveServer2Hook()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveCliHook` from `airflow.providers.apache.hive.hooks.hive` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.hooks.hive.HiveCliHook` instead.

 AIR302_hive.py:40:1: AIR302 `airflow.hooks.hive_hooks.HiveMetastoreHook` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -40,7 +40,7 @@ AIR302_hive.py:40:1: AIR302 `airflow.hooks.hive_hooks.HiveMetastoreHook` is move
 41 | HiveServer2Hook()
 42 | HIVE_QUEUE_PRIORITIES
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveMetastoreHook` from `airflow.providers.apache.hive.hooks.hive` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.hooks.hive.HiveMetastoreHook` instead.

 AIR302_hive.py:41:1: AIR302 `airflow.hooks.hive_hooks.HiveServer2Hook` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -50,7 +50,7 @@ AIR302_hive.py:41:1: AIR302 `airflow.hooks.hive_hooks.HiveServer2Hook` is moved
   | ^^^^^^^^^^^^^^^ AIR302
 42 | HIVE_QUEUE_PRIORITIES
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveServer2Hook` from `airflow.providers.apache.hive.hooks.hive` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.hooks.hive.HiveServer2Hook` instead.

 AIR302_hive.py:42:1: AIR302 `airflow.hooks.hive_hooks.HIVE_QUEUE_PRIORITIES` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -61,7 +61,7 @@ AIR302_hive.py:42:1: AIR302 `airflow.hooks.hive_hooks.HIVE_QUEUE_PRIORITIES` is
 43 |
 44 | HiveOperator()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HIVE_QUEUE_PRIORITIES` from `airflow.providers.apache.hive.hooks.hive` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.hooks.hive.HIVE_QUEUE_PRIORITIES` instead.

 AIR302_hive.py:44:1: AIR302 `airflow.operators.hive_operator.HiveOperator` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -72,7 +72,7 @@ AIR302_hive.py:44:1: AIR302 `airflow.operators.hive_operator.HiveOperator` is mo
 45 |
 46 | HiveStatsCollectionOperator()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveOperator` from `airflow.providers.apache.hive.operators.hive` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.operators.hive.HiveOperator` instead.

 AIR302_hive.py:46:1: AIR302 `airflow.operators.hive_stats_operator.HiveStatsCollectionOperator` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -83,7 +83,7 @@ AIR302_hive.py:46:1: AIR302 `airflow.operators.hive_stats_operator.HiveStatsColl
 47 |
 48 | HiveToMySqlOperator()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveStatsCollectionOperator` from `airflow.providers.apache.hive.operators.hive_stats` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.operators.hive_stats.HiveStatsCollectionOperator` instead.

 AIR302_hive.py:48:1: AIR302 `airflow.operators.hive_to_mysql.HiveToMySqlOperator` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -93,7 +93,7 @@ AIR302_hive.py:48:1: AIR302 `airflow.operators.hive_to_mysql.HiveToMySqlOperator
   | ^^^^^^^^^^^^^^^^^^^ AIR302
 49 | HiveToMySqlTransfer()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveToMySqlOperator` from `airflow.providers.apache.hive.transfers.hive_to_mysql` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.transfers.hive_to_mysql.HiveToMySqlOperator` instead.

 AIR302_hive.py:49:1: AIR302 `airflow.operators.hive_to_mysql.HiveToMySqlTransfer` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -103,7 +103,7 @@ AIR302_hive.py:49:1: AIR302 `airflow.operators.hive_to_mysql.HiveToMySqlTransfer
 50 |
 51 | HiveToSambaOperator()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveToMySqlOperator` from `airflow.providers.apache.hive.transfers.hive_to_mysql` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.transfers.hive_to_mysql.HiveToMySqlOperator` instead.

 AIR302_hive.py:51:1: AIR302 `airflow.operators.hive_to_samba_operator.HiveToSambaOperator` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -114,7 +114,7 @@ AIR302_hive.py:51:1: AIR302 `airflow.operators.hive_to_samba_operator.HiveToSamb
 52 |
 53 | MsSqlToHiveOperator()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HiveToSambaOperator` from `airflow.providers.apache.hive.transfers.hive_to_samba` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.transfers.hive_to_samba.HiveToSambaOperator` instead.

 AIR302_hive.py:53:1: AIR302 `airflow.operators.mssql_to_hive.MsSqlToHiveOperator` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -124,7 +124,7 @@ AIR302_hive.py:53:1: AIR302 `airflow.operators.mssql_to_hive.MsSqlToHiveOperator
   | ^^^^^^^^^^^^^^^^^^^ AIR302
 54 | MsSqlToHiveTransfer()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `MsSqlToHiveOperator` from `airflow.providers.apache.hive.transfers.mssql_to_hive` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.transfers.mssql_to_hive.MsSqlToHiveOperator` instead.

 AIR302_hive.py:54:1: AIR302 `airflow.operators.mssql_to_hive.MsSqlToHiveTransfer` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -134,7 +134,7 @@ AIR302_hive.py:54:1: AIR302 `airflow.operators.mssql_to_hive.MsSqlToHiveTransfer
 55 |
 56 | MySqlToHiveOperator()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `MsSqlToHiveOperator` from `airflow.providers.apache.hive.transfers.mssql_to_hive` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.transfers.mssql_to_hive.MsSqlToHiveOperator` instead.

 AIR302_hive.py:56:1: AIR302 `airflow.operators.mysql_to_hive.MySqlToHiveOperator` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -144,7 +144,7 @@ AIR302_hive.py:56:1: AIR302 `airflow.operators.mysql_to_hive.MySqlToHiveOperator
   | ^^^^^^^^^^^^^^^^^^^ AIR302
 57 | MySqlToHiveTransfer()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `MySqlToHiveOperator` from `airflow.providers.apache.hive.transfers.mysql_to_hive` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.transfers.mysql_to_hive.MySqlToHiveOperator` instead.

 AIR302_hive.py:57:1: AIR302 `airflow.operators.mysql_to_hive.MySqlToHiveTransfer` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -154,7 +154,7 @@ AIR302_hive.py:57:1: AIR302 `airflow.operators.mysql_to_hive.MySqlToHiveTransfer
 58 |
 59 | S3ToHiveOperator()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `MySqlToHiveOperator` from `airflow.providers.apache.hive.transfers.mysql_to_hive` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.transfers.mysql_to_hive.MySqlToHiveOperator` instead.

 AIR302_hive.py:59:1: AIR302 `airflow.operators.s3_to_hive_operator.S3ToHiveOperator` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -164,7 +164,7 @@ AIR302_hive.py:59:1: AIR302 `airflow.operators.s3_to_hive_operator.S3ToHiveOpera
   | ^^^^^^^^^^^^^^^^ AIR302
 60 | S3ToHiveTransfer()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `S3ToHiveOperator` from `airflow.providers.apache.hive.transfers.s3_to_hive` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.transfers.s3_to_hive.S3ToHiveOperator` instead.

 AIR302_hive.py:60:1: AIR302 `airflow.operators.s3_to_hive_operator.S3ToHiveTransfer` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -174,7 +174,7 @@ AIR302_hive.py:60:1: AIR302 `airflow.operators.s3_to_hive_operator.S3ToHiveTrans
 61 |
 62 | HivePartitionSensor()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `S3ToHiveOperator` from `airflow.providers.apache.hive.transfers.s3_to_hive` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.transfers.s3_to_hive.S3ToHiveOperator` instead.

 AIR302_hive.py:62:1: AIR302 `airflow.sensors.hive_partition_sensor.HivePartitionSensor` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -185,7 +185,7 @@ AIR302_hive.py:62:1: AIR302 `airflow.sensors.hive_partition_sensor.HivePartition
 63 |
 64 | MetastorePartitionSensor()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `HivePartitionSensor` from `airflow.providers.apache.hive.sensors.hive_partition` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.sensors.hive_partition.HivePartitionSensor` instead.

 AIR302_hive.py:64:1: AIR302 `airflow.sensors.metastore_partition_sensor.MetastorePartitionSensor` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -196,7 +196,7 @@ AIR302_hive.py:64:1: AIR302 `airflow.sensors.metastore_partition_sensor.Metastor
 65 |
 66 | NamedHivePartitionSensor()
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `MetastorePartitionSensor` from `airflow.providers.apache.hive.sensors.metastore_partition` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.sensors.metastore_partition.MetastorePartitionSensor` instead.

 AIR302_hive.py:66:1: AIR302 `airflow.sensors.named_hive_partition_sensor.NamedHivePartitionSensor` is moved into `apache-hive` provider in Airflow 3.0;
   |
@@ -205,4 +205,4 @@ AIR302_hive.py:66:1: AIR302 `airflow.sensors.named_hive_partition_sensor.NamedHi
 66 | NamedHivePartitionSensor()
   | ^^^^^^^^^^^^^^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `NamedHivePartitionSensor` from `airflow.providers.apache.hive.sensors.named_hive_partition` instead.
+   = help: Install `apache-airflow-providers-apache-hive>=1.0.0` and use `airflow.providers.apache.hive.sensors.named_hive_partition.NamedHivePartitionSensor` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_http.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_http.py.snap
@@ -10,7 +10,7 @@ AIR302_http.py:7:1: AIR302 `airflow.hooks.http_hook.HttpHook` is moved into `htt
 8 | SimpleHttpOperator()
 9 | HttpSensor()
  |
-  = help: Install `apache-airflow-providers-http>=1.0.0` and use `HttpHook` from `airflow.providers.http.hooks.http` instead.
+  = help: Install `apache-airflow-providers-http>=1.0.0` and use `airflow.providers.http.hooks.http.HttpHook` instead.

 AIR302_http.py:8:1: AIR302 [*] `airflow.operators.http_operator.SimpleHttpOperator` is moved into `http` provider in Airflow 3.0;
  |
@@ -19,7 +19,7 @@ AIR302_http.py:8:1: AIR302 [*] `airflow.operators.http_operator.SimpleHttpOperat
  | ^^^^^^^^^^^^^^^^^^ AIR302
 9 | HttpSensor()
  |
-  = help: Install `apache-airflow-providers-http>=5.0.0` and use `HttpOperator` from `airflow.providers.http.operators.http` instead.
+  = help: Install `apache-airflow-providers-http>=5.0.0` and use `airflow.providers.http.operators.http.HttpOperator` instead.

 ℹ Safe fix
 3  3  | from airflow.hooks.http_hook import HttpHook
@@ -39,4 +39,4 @@ AIR302_http.py:9:1: AIR302 `airflow.sensors.http_sensor.HttpSensor` is moved int
 9 | HttpSensor()
  | ^^^^^^^^^^ AIR302
  |
-  = help: Install `apache-airflow-providers-http>=1.0.0` and use `HttpSensor` from `airflow.providers.http.sensors.http` instead.
+  = help: Install `apache-airflow-providers-http>=1.0.0` and use `airflow.providers.http.sensors.http.HttpSensor` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_jdbc.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_jdbc.py.snap
@@ -9,7 +9,7 @@ AIR302_jdbc.py:8:1: AIR302 `airflow.hooks.jdbc_hook.JdbcHook` is moved into `jdb
  | ^^^^^^^^ AIR302
 9 | jaydebeapi()
  |
-  = help: Install `apache-airflow-providers-jdbc>=1.0.0` and use `JdbcHook` from `airflow.providers.jdbc.hooks.jdbc` instead.
+  = help: Install `apache-airflow-providers-jdbc>=1.0.0` and use `airflow.providers.jdbc.hooks.jdbc.JdbcHook` instead.

 AIR302_jdbc.py:9:1: AIR302 `airflow.hooks.jdbc_hook.jaydebeapi` is moved into `jdbc` provider in Airflow 3.0;
  |
@@ -17,4 +17,4 @@ AIR302_jdbc.py:9:1: AIR302 `airflow.hooks.jdbc_hook.jaydebeapi` is moved into `j
 9 | jaydebeapi()
  | ^^^^^^^^^^ AIR302
  |
-  = help: Install `apache-airflow-providers-jdbc>=1.0.0` and use `jaydebeapi` from `airflow.providers.jdbc.hooks.jdbc` instead.
+  = help: Install `apache-airflow-providers-jdbc>=1.0.0` and use `airflow.providers.jdbc.hooks.jdbc.jaydebeapi` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_kubernetes.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_kubernetes.py.snap
@@ -9,7 +9,7 @@ AIR302_kubernetes.py:29:1: AIR302 `airflow.executors.kubernetes_executor_types.A
   | ^^^^^^^^^^^^^^ AIR302
 30 | POD_EXECUTOR_DONE_KEY
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `ALL_NAMESPACES` from `airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types.ALL_NAMESPACES` instead.

 AIR302_kubernetes.py:30:1: AIR302 `airflow.executors.kubernetes_executor_types.POD_EXECUTOR_DONE_KEY` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -19,7 +19,7 @@ AIR302_kubernetes.py:30:1: AIR302 `airflow.executors.kubernetes_executor_types.P
 31 |
 32 | K8SModel()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `POD_EXECUTOR_DONE_KEY` from `airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types.POD_EXECUTOR_DONE_KEY` instead.

 AIR302_kubernetes.py:32:1: AIR302 `airflow.kubernetes.k8s_model.K8SModel` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -29,7 +29,7 @@ AIR302_kubernetes.py:32:1: AIR302 `airflow.kubernetes.k8s_model.K8SModel` is mov
   | ^^^^^^^^ AIR302
 33 | append_to_pod()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `K8SModel` from `airflow.providers.cncf.kubernetes.k8s_model` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.k8s_model.K8SModel` instead.

 AIR302_kubernetes.py:33:1: AIR302 `airflow.kubernetes.k8s_model.append_to_pod` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -39,7 +39,7 @@ AIR302_kubernetes.py:33:1: AIR302 `airflow.kubernetes.k8s_model.append_to_pod` i
 34 |
 35 | _disable_verify_ssl()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `append_to_pod` from `airflow.providers.cncf.kubernetes.k8s_model` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.k8s_model.append_to_pod` instead.

 AIR302_kubernetes.py:35:1: AIR302 `airflow.kubernetes.kube_client._disable_verify_ssl` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -50,7 +50,7 @@ AIR302_kubernetes.py:35:1: AIR302 `airflow.kubernetes.kube_client._disable_verif
 36 | _enable_tcp_keepalive()
 37 | get_kube_client()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `_disable_verify_ssl` from `airflow.providers.cncf.kubernetes.kube_client` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.kube_client._disable_verify_ssl` instead.

 AIR302_kubernetes.py:36:1: AIR302 `airflow.kubernetes.kube_client._enable_tcp_keepalive` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -59,7 +59,7 @@ AIR302_kubernetes.py:36:1: AIR302 `airflow.kubernetes.kube_client._enable_tcp_ke
   | ^^^^^^^^^^^^^^^^^^^^^ AIR302
 37 | get_kube_client()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `_enable_tcp_keepalive` from `airflow.providers.cncf.kubernetes.kube_client` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.kube_client._enable_tcp_keepalive` instead.

 AIR302_kubernetes.py:37:1: AIR302 `airflow.kubernetes.kube_client.get_kube_client` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -70,7 +70,7 @@ AIR302_kubernetes.py:37:1: AIR302 `airflow.kubernetes.kube_client.get_kube_clien
 38 |
 39 | add_pod_suffix()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `get_kube_client` from `airflow.providers.cncf.kubernetes.kube_client` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.kube_client.get_kube_client` instead.

 AIR302_kubernetes.py:39:1: AIR302 [*] `airflow.kubernetes.kubernetes_helper_functions.add_pod_suffix` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -80,7 +80,7 @@ AIR302_kubernetes.py:39:1: AIR302 [*] `airflow.kubernetes.kubernetes_helper_func
   | ^^^^^^^^^^^^^^ AIR302
 40 | create_pod_id()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=10.0.0` and use `add_unique_suffix` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=10.0.0` and use `airflow.providers.cncf.kubernetes.kubernetes_helper_functions.add_unique_suffix` instead.

 ℹ Safe fix
 25 25 |     Port,
@@ -108,7 +108,7 @@ AIR302_kubernetes.py:40:1: AIR302 [*] `airflow.kubernetes.kubernetes_helper_func
 41 |
 42 | annotations_for_logging_task_metadata()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=10.0.0` and use `create_unique_id` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=10.0.0` and use `airflow.providers.cncf.kubernetes.kubernetes_helper_functions.create_unique_id` instead.

 ℹ Safe fix
 25 25 |     Port,
@@ -137,7 +137,7 @@ AIR302_kubernetes.py:42:1: AIR302 `airflow.kubernetes.kubernetes_helper_function
 43 | annotations_to_key()
 44 | get_logs_task_metadata()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `annotations_for_logging_task_metadata` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.kubernetes_helper_functions.annotations_for_logging_task_metadata` instead.

 AIR302_kubernetes.py:43:1: AIR302 `airflow.kubernetes.kubernetes_helper_functions.annotations_to_key` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -147,7 +147,7 @@ AIR302_kubernetes.py:43:1: AIR302 `airflow.kubernetes.kubernetes_helper_function
 44 | get_logs_task_metadata()
 45 | rand_str()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `annotations_to_key` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.kubernetes_helper_functions.annotations_to_key` instead.

 AIR302_kubernetes.py:44:1: AIR302 `airflow.kubernetes.kubernetes_helper_functions.get_logs_task_metadata` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -157,7 +157,7 @@ AIR302_kubernetes.py:44:1: AIR302 `airflow.kubernetes.kubernetes_helper_function
   | ^^^^^^^^^^^^^^^^^^^^^^ AIR302
 45 | rand_str()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `get_logs_task_metadata` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.kubernetes_helper_functions.get_logs_task_metadata` instead.

 AIR302_kubernetes.py:45:1: AIR302 `airflow.kubernetes.kubernetes_helper_functions.rand_str` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -168,7 +168,7 @@ AIR302_kubernetes.py:45:1: AIR302 `airflow.kubernetes.kubernetes_helper_function
 46 |
 47 | Port()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `rand_str` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.kubernetes_helper_functions.rand_str` instead.

 AIR302_kubernetes.py:47:1: AIR302 [*] `airflow.kubernetes.pod.Port` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -178,7 +178,7 @@ AIR302_kubernetes.py:47:1: AIR302 [*] `airflow.kubernetes.pod.Port` is moved int
   | ^^^^ AIR302
 48 | Resources()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `V1ContainerPort` from `kubernetes.client.models` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `kubernetes.client.models.V1ContainerPort` instead.

 ℹ Safe fix
 25 25 |     Port,
@@ -204,7 +204,7 @@ AIR302_kubernetes.py:48:1: AIR302 [*] `airflow.kubernetes.pod.Resources` is move
 48 | Resources()
   | ^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `V1ResourceRequirements` from `kubernetes.client.models` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `kubernetes.client.models.V1ResourceRequirements` instead.

 ℹ Safe fix
 25 25 |     Port,
@@ -233,7 +233,7 @@ AIR302_kubernetes.py:64:1: AIR302 `airflow.kubernetes.pod_generator.datetime_to_
 65 | extend_object_field()
 66 | label_safe_datestring_to_datetime()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `datetime_to_label_safe_datestring` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.pod_generator.datetime_to_label_safe_datestring` instead.

 AIR302_kubernetes.py:65:1: AIR302 `airflow.kubernetes.pod_generator.extend_object_field` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -243,7 +243,7 @@ AIR302_kubernetes.py:65:1: AIR302 `airflow.kubernetes.pod_generator.extend_objec
 66 | label_safe_datestring_to_datetime()
 67 | make_safe_label_value()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `extend_object_field` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.pod_generator.extend_object_field` instead.

 AIR302_kubernetes.py:66:1: AIR302 `airflow.kubernetes.pod_generator.label_safe_datestring_to_datetime` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -254,7 +254,7 @@ AIR302_kubernetes.py:66:1: AIR302 `airflow.kubernetes.pod_generator.label_safe_d
 67 | make_safe_label_value()
 68 | merge_objects()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `label_safe_datestring_to_datetime` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.pod_generator.label_safe_datestring_to_datetime` instead.

 AIR302_kubernetes.py:67:1: AIR302 `airflow.kubernetes.pod_generator.make_safe_label_value` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -265,7 +265,7 @@ AIR302_kubernetes.py:67:1: AIR302 `airflow.kubernetes.pod_generator.make_safe_la
 68 | merge_objects()
 69 | PodGenerator()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `make_safe_label_value` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.pod_generator.make_safe_label_value` instead.

 AIR302_kubernetes.py:68:1: AIR302 `airflow.kubernetes.pod_generator.merge_objects` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -276,7 +276,7 @@ AIR302_kubernetes.py:68:1: AIR302 `airflow.kubernetes.pod_generator.merge_object
 69 | PodGenerator()
 70 | PodDefaults()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `merge_objects` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.pod_generator.merge_objects` instead.

 AIR302_kubernetes.py:69:1: AIR302 `airflow.kubernetes.pod_generator.PodGenerator` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -287,7 +287,7 @@ AIR302_kubernetes.py:69:1: AIR302 `airflow.kubernetes.pod_generator.PodGenerator
 70 | PodDefaults()
 71 | PodGeneratorDeprecated()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodGenerator` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.pod_generator.PodGenerator` instead.

 AIR302_kubernetes.py:70:1: AIR302 `airflow.kubernetes.pod_generator.PodDefaults` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -298,7 +298,7 @@ AIR302_kubernetes.py:70:1: AIR302 `airflow.kubernetes.pod_generator.PodDefaults`
 71 | PodGeneratorDeprecated()
 72 | add_pod_suffix()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodDefaults` from `airflow.providers.cncf.kubernetes.utils.xcom_sidecar` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.utils.xcom_sidecar.PodDefaults` instead.

 AIR302_kubernetes.py:71:1: AIR302 `airflow.kubernetes.pod_generator.PodGeneratorDeprecated` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -309,7 +309,7 @@ AIR302_kubernetes.py:71:1: AIR302 `airflow.kubernetes.pod_generator.PodGenerator
 72 | add_pod_suffix()
 73 | rand_str()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodGenerator` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.pod_generator.PodGenerator` instead.

 AIR302_kubernetes.py:72:1: AIR302 [*] `airflow.kubernetes.pod_generator.add_pod_suffix` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -319,7 +319,7 @@ AIR302_kubernetes.py:72:1: AIR302 [*] `airflow.kubernetes.pod_generator.add_pod_
   | ^^^^^^^^^^^^^^ AIR302
 73 | rand_str()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=10.0.0` and use `add_unique_suffix` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=10.0.0` and use `airflow.providers.cncf.kubernetes.kubernetes_helper_functions.add_unique_suffix` instead.

 ℹ Safe fix
 60 60 |     merge_objects,
@@ -346,7 +346,7 @@ AIR302_kubernetes.py:73:1: AIR302 `airflow.kubernetes.pod_generator.rand_str` is
 73 | rand_str()
   | ^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `rand_str` from `airflow.providers.cncf.kubernetes.kubernetes_helper_functions` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.kubernetes_helper_functions.rand_str` instead.

 AIR302_kubernetes.py:86:1: AIR302 `airflow.kubernetes.pod_generator_deprecated.PodDefaults` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -357,7 +357,7 @@ AIR302_kubernetes.py:86:1: AIR302 `airflow.kubernetes.pod_generator_deprecated.P
 87 | PodGenerator()
 88 | make_safe_label_value()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodDefaults` from `airflow.providers.cncf.kubernetes.utils.xcom_sidecar` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.utils.xcom_sidecar.PodDefaults` instead.

 AIR302_kubernetes.py:87:1: AIR302 `airflow.kubernetes.pod_generator_deprecated.PodGenerator` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -366,7 +366,7 @@ AIR302_kubernetes.py:87:1: AIR302 `airflow.kubernetes.pod_generator_deprecated.P
   | ^^^^^^^^^^^^ AIR302
 88 | make_safe_label_value()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodGenerator` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.pod_generator.PodGenerator` instead.

 AIR302_kubernetes.py:88:1: AIR302 `airflow.kubernetes.pod_generator_deprecated.make_safe_label_value` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -377,7 +377,7 @@ AIR302_kubernetes.py:88:1: AIR302 `airflow.kubernetes.pod_generator_deprecated.m
 89 |
 90 | PodLauncher()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `make_safe_label_value` from `airflow.providers.cncf.kubernetes.pod_generator` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.pod_generator.make_safe_label_value` instead.

 AIR302_kubernetes.py:90:1: AIR302 [*] `airflow.kubernetes.pod_launcher.PodLauncher` is moved into `cncf-kubernetes` provider in Airflow 3.0;
   |
@@ -387,7 +387,7 @@ AIR302_kubernetes.py:90:1: AIR302 [*] `airflow.kubernetes.pod_launcher.PodLaunch
   | ^^^^^^^^^^^ AIR302
 91 | PodStatus()
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use `PodManager` from `airflow.providers.cncf.kubernetes.utils.pod_manager` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use `airflow.providers.cncf.kubernetes.utils.pod_manager.PodManager` instead.

 ℹ Safe fix
 82 82 |     PodLauncher,
@@ -411,7 +411,7 @@ AIR302_kubernetes.py:91:1: AIR302 [*] `airflow.kubernetes.pod_launcher.PodStatus
 91 | PodStatus()
   | ^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use `PodPhase` from ` airflow.providers.cncf.kubernetes.utils.pod_manager` instead.
+   = help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use ` airflow.providers.cncf.kubernetes.utils.pod_manager.PodPhase` instead.

 ℹ Safe fix
 82 82 |     PodLauncher,
@@ -439,7 +439,7 @@ AIR302_kubernetes.py:108:1: AIR302 `airflow.kubernetes.pod_launcher_deprecated.P
 109 | PodLauncher()
 110 | PodStatus()
    |
-    = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `PodDefaults` from `airflow.providers.cncf.kubernetes.utils.xcom_sidecar` instead.
+    = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.utils.xcom_sidecar.PodDefaults` instead.

 AIR302_kubernetes.py:109:1: AIR302 [*] `airflow.kubernetes.pod_launcher_deprecated.PodLauncher` is moved into `cncf-kubernetes` provider in Airflow 3.0;
    |
@@ -449,7 +449,7 @@ AIR302_kubernetes.py:109:1: AIR302 [*] `airflow.kubernetes.pod_launcher_deprecat
 110 | PodStatus()
 111 | get_kube_client()
    |
-    = help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use `PodManager` from `airflow.providers.cncf.kubernetes.utils.pod_manager` instead.
+    = help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use `airflow.providers.cncf.kubernetes.utils.pod_manager.PodManager` instead.

 ℹ Safe fix
 104 104 | )
@@ -472,7 +472,7 @@ AIR302_kubernetes.py:110:1: AIR302 [*] `airflow.kubernetes.pod_launcher_deprecat
    | ^^^^^^^^^ AIR302
 111 | get_kube_client()
    |
-    = help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use `PodPhase` from ` airflow.providers.cncf.kubernetes.utils.pod_manager` instead.
+    = help: Install `apache-airflow-providers-cncf-kubernetes>=3.0.0` and use ` airflow.providers.cncf.kubernetes.utils.pod_manager.PodPhase` instead.

 ℹ Safe fix
 104 104 | )
@@ -497,7 +497,7 @@ AIR302_kubernetes.py:111:1: AIR302 `airflow.kubernetes.pod_launcher_deprecated.g
 112 |
 113 | PodRuntimeInfoEnv()
    |
-    = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `get_kube_client` from `airflow.providers.cncf.kubernetes.kube_client` instead.
+    = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.kube_client.get_kube_client` instead.

 AIR302_kubernetes.py:113:1: AIR302 [*] `airflow.kubernetes.pod_runtime_info_env.PodRuntimeInfoEnv` is moved into `cncf-kubernetes` provider in Airflow 3.0;
    |
@@ -508,7 +508,7 @@ AIR302_kubernetes.py:113:1: AIR302 [*] `airflow.kubernetes.pod_runtime_info_env.
 114 | K8SModel()
 115 | Secret()
    |
-    = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `V1EnvVar` from `kubernetes.client.models` instead.
+    = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `kubernetes.client.models.V1EnvVar` instead.

 ℹ Safe fix
 104 104 | )
@@ -535,7 +535,7 @@ AIR302_kubernetes.py:114:1: AIR302 `airflow.kubernetes.secret.K8SModel` is moved
 115 | Secret()
 116 | Volume()
    |
-    = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `K8SModel` from `airflow.providers.cncf.kubernetes.k8s_model` instead.
+    = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.k8s_model.K8SModel` instead.

 AIR302_kubernetes.py:115:1: AIR302 `airflow.kubernetes.secret.Secret` is moved into `cncf-kubernetes` provider in Airflow 3.0;
    |
@@ -546,7 +546,7 @@ AIR302_kubernetes.py:115:1: AIR302 `airflow.kubernetes.secret.Secret` is moved i
 116 | Volume()
 117 | VolumeMount()
    |
-    = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `Secret` from `airflow.providers.cncf.kubernetes.secret` instead.
+    = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `airflow.providers.cncf.kubernetes.secret.Secret` instead.

 AIR302_kubernetes.py:116:1: AIR302 [*] `airflow.kubernetes.volume.Volume` is moved into `cncf-kubernetes` provider in Airflow 3.0;
    |
@@ -556,7 +556,7 @@ AIR302_kubernetes.py:116:1: AIR302 [*] `airflow.kubernetes.volume.Volume` is mov
    | ^^^^^^ AIR302
 117 | VolumeMount()
    |
-    = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `V1Volume` from `kubernetes.client.models` instead.
+    = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `kubernetes.client.models.V1Volume` instead.

 ℹ Safe fix
 104 104 | )
@@ -581,7 +581,7 @@ AIR302_kubernetes.py:117:1: AIR302 [*] `airflow.kubernetes.volume_mount.VolumeMo
 117 | VolumeMount()
    | ^^^^^^^^^^^ AIR302
    |
-    = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `V1VolumeMount` from `kubernetes.client.models` instead.
+    = help: Install `apache-airflow-providers-cncf-kubernetes>=7.4.0` and use `kubernetes.client.models.V1VolumeMount` instead.

 ℹ Safe fix
 104 104 | )
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_mysql.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_mysql.py.snap
@@ -10,7 +10,7 @@ AIR302_mysql.py:9:1: AIR302 `airflow.hooks.mysql_hook.MySqlHook` is moved into `
 10 | PrestoToMySqlOperator()
 11 | PrestoToMySqlTransfer()
   |
-   = help: Install `apache-airflow-providers-mysql>=1.0.0` and use `MySqlHook` from `airflow.providers.mysql.hooks.mysql` instead.
+   = help: Install `apache-airflow-providers-mysql>=1.0.0` and use `airflow.providers.mysql.hooks.mysql.MySqlHook` instead.

 AIR302_mysql.py:10:1: AIR302 `airflow.operators.presto_to_mysql.PrestoToMySqlOperator` is moved into `mysql` provider in Airflow 3.0;
   |
@@ -19,7 +19,7 @@ AIR302_mysql.py:10:1: AIR302 `airflow.operators.presto_to_mysql.PrestoToMySqlOpe
   | ^^^^^^^^^^^^^^^^^^^^^ AIR302
 11 | PrestoToMySqlTransfer()
   |
-   = help: Install `apache-airflow-providers-mysql>=1.0.0` and use `PrestoToMySqlOperator` from `airflow.providers.mysql.transfers.presto_to_mysql` instead.
+   = help: Install `apache-airflow-providers-mysql>=1.0.0` and use `airflow.providers.mysql.transfers.presto_to_mysql.PrestoToMySqlOperator` instead.

 AIR302_mysql.py:11:1: AIR302 `airflow.operators.presto_to_mysql.PrestoToMySqlTransfer` is moved into `mysql` provider in Airflow 3.0;
   |
@@ -28,4 +28,4 @@ AIR302_mysql.py:11:1: AIR302 `airflow.operators.presto_to_mysql.PrestoToMySqlTra
 11 | PrestoToMySqlTransfer()
   | ^^^^^^^^^^^^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-mysql>=1.0.0` and use `PrestoToMySqlOperator` from `airflow.providers.mysql.transfers.presto_to_mysql` instead.
+   = help: Install `apache-airflow-providers-mysql>=1.0.0` and use `airflow.providers.mysql.transfers.presto_to_mysql.PrestoToMySqlOperator` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_oracle.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_oracle.py.snap
@@ -8,4 +8,4 @@ AIR302_oracle.py:5:1: AIR302 `airflow.hooks.oracle_hook.OracleHook` is moved int
 5 | OracleHook()
  | ^^^^^^^^^^ AIR302
  |
-  = help: Install `apache-airflow-providers-oracle>=1.0.0` and use `OracleHook` from `airflow.providers.oracle.hooks.oracle` instead.
+  = help: Install `apache-airflow-providers-oracle>=1.0.0` and use `airflow.providers.oracle.hooks.oracle.OracleHook` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_papermill.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_papermill.py.snap
@@ -8,4 +8,4 @@ AIR302_papermill.py:5:1: AIR302 `airflow.operators.papermill_operator.PapermillO
 5 | PapermillOperator()
  | ^^^^^^^^^^^^^^^^^ AIR302
  |
-  = help: Install `apache-airflow-providers-papermill>=1.0.0` and use `PapermillOperator` from `airflow.providers.papermill.operators.papermill` instead.
+  = help: Install `apache-airflow-providers-papermill>=1.0.0` and use `airflow.providers.papermill.operators.papermill.PapermillOperator` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_pig.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_pig.py.snap
@@ -9,7 +9,7 @@ AIR302_pig.py:6:1: AIR302 `airflow.hooks.pig_hook.PigCliHook` is moved into `apa
  | ^^^^^^^^^^ AIR302
 7 | PigOperator()
  |
-  = help: Install `apache-airflow-providers-apache-pig>=1.0.0` and use `PigCliHook` from `airflow.providers.apache.pig.hooks.pig` instead.
+  = help: Install `apache-airflow-providers-apache-pig>=1.0.0` and use `airflow.providers.apache.pig.hooks.pig.PigCliHook` instead.

 AIR302_pig.py:7:1: AIR302 `airflow.operators.pig_operator.PigOperator` is moved into `apache-pig` provider in Airflow 3.0;
  |
@@ -17,4 +17,4 @@ AIR302_pig.py:7:1: AIR302 `airflow.operators.pig_operator.PigOperator` is moved
 7 | PigOperator()
  | ^^^^^^^^^^^ AIR302
  |
-  = help: Install `apache-airflow-providers-apache-pig>=1.0.0` and use `PigOperator` from `airflow.providers.apache.pig.operators.pig` instead.
+  = help: Install `apache-airflow-providers-apache-pig>=1.0.0` and use `airflow.providers.apache.pig.operators.pig.PigOperator` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_postgres.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_postgres.py.snap
@@ -9,7 +9,7 @@ AIR302_postgres.py:6:1: AIR302 `airflow.hooks.postgres_hook.PostgresHook` is mov
  | ^^^^^^^^^^^^ AIR302
 7 | Mapping()
  |
-  = help: Install `apache-airflow-providers-postgres>=1.0.0` and use `PostgresHook` from `airflow.providers.postgres.hooks.postgres` instead.
+  = help: Install `apache-airflow-providers-postgres>=1.0.0` and use `airflow.providers.postgres.hooks.postgres.PostgresHook` instead.

 AIR302_postgres.py:7:1: AIR302 `airflow.operators.postgres_operator.Mapping` is removed in Airflow 3.0
  |
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_presto.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_presto.py.snap
@@ -8,4 +8,4 @@ AIR302_presto.py:5:1: AIR302 `airflow.hooks.presto_hook.PrestoHook` is moved int
 5 | PrestoHook()
  | ^^^^^^^^^^ AIR302
  |
-  = help: Install `apache-airflow-providers-presto>=1.0.0` and use `PrestoHook` from `airflow.providers.presto.hooks.presto` instead.
+  = help: Install `apache-airflow-providers-presto>=1.0.0` and use `airflow.providers.presto.hooks.presto.PrestoHook` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_samba.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_samba.py.snap
@@ -8,4 +8,4 @@ AIR302_samba.py:5:1: AIR302 `airflow.hooks.samba_hook.SambaHook` is moved into `
 5 | SambaHook()
  | ^^^^^^^^^ AIR302
  |
-  = help: Install `apache-airflow-providers-samba>=1.0.0` and use `SambaHook` from `airflow.providers.samba.hooks.samba` instead.
+  = help: Install `apache-airflow-providers-samba>=1.0.0` and use `airflow.providers.samba.hooks.samba.SambaHook` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_slack.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_slack.py.snap
@@ -10,7 +10,7 @@ AIR302_slack.py:6:1: AIR302 `airflow.hooks.slack_hook.SlackHook` is moved into `
 7 | SlackAPIOperator()
 8 | SlackAPIPostOperator()
  |
-  = help: Install `apache-airflow-providers-slack>=1.0.0` and use `SlackHook` from `airflow.providers.slack.hooks.slack` instead.
+  = help: Install `apache-airflow-providers-slack>=1.0.0` and use `airflow.providers.slack.hooks.slack.SlackHook` instead.

 AIR302_slack.py:7:1: AIR302 `airflow.operators.slack_operator.SlackAPIOperator` is moved into `slack` provider in Airflow 3.0;
  |
@@ -19,7 +19,7 @@ AIR302_slack.py:7:1: AIR302 `airflow.operators.slack_operator.SlackAPIOperator`
  | ^^^^^^^^^^^^^^^^ AIR302
 8 | SlackAPIPostOperator()
  |
-  = help: Install `apache-airflow-providers-slack>=1.0.0` and use `SlackAPIOperator` from `airflow.providers.slack.operators.slack` instead.
+  = help: Install `apache-airflow-providers-slack>=1.0.0` and use `airflow.providers.slack.operators.slack.SlackAPIOperator` instead.

 AIR302_slack.py:8:1: AIR302 `airflow.operators.slack_operator.SlackAPIPostOperator` is moved into `slack` provider in Airflow 3.0;
  |
@@ -28,4 +28,4 @@ AIR302_slack.py:8:1: AIR302 `airflow.operators.slack_operator.SlackAPIPostOperat
 8 | SlackAPIPostOperator()
  | ^^^^^^^^^^^^^^^^^^^^ AIR302
  |
-  = help: Install `apache-airflow-providers-slack>=1.0.0` and use `SlackAPIPostOperator` from `airflow.providers.slack.operators.slack` instead.
+  = help: Install `apache-airflow-providers-slack>=1.0.0` and use `airflow.providers.slack.operators.slack.SlackAPIPostOperator` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_smtp.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_smtp.py.snap
@@ -10,7 +10,7 @@ AIR302_smtp.py:5:1: AIR302 `airflow.operators.email_operator.EmailOperator` is m
 6 |
 7 | from airflow.operators.email import EmailOperator
  |
-  = help: Install `apache-airflow-providers-smtp>=1.0.0` and use `EmailOperator` from `airflow.providers.smtp.operators.smtp` instead.
+  = help: Install `apache-airflow-providers-smtp>=1.0.0` and use `airflow.providers.smtp.operators.smtp.EmailOperator` instead.

 AIR302_smtp.py:9:1: AIR302 `airflow.operators.email.EmailOperator` is moved into `smtp` provider in Airflow 3.0;
  |
@@ -19,4 +19,4 @@ AIR302_smtp.py:9:1: AIR302 `airflow.operators.email.EmailOperator` is moved into
 9 | EmailOperator()
  | ^^^^^^^^^^^^^ AIR302
  |
-  = help: Install `apache-airflow-providers-smtp>=1.0.0` and use `EmailOperator` from `airflow.providers.smtp.operators.smtp` instead.
+  = help: Install `apache-airflow-providers-smtp>=1.0.0` and use `airflow.providers.smtp.operators.smtp.EmailOperator` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_sqlite.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_sqlite.py.snap
@@ -8,4 +8,4 @@ AIR302_sqlite.py:5:1: AIR302 `airflow.hooks.sqlite_hook.SqliteHook` is moved int
 5 | SqliteHook()
  | ^^^^^^^^^^ AIR302
  |
-  = help: Install `apache-airflow-providers-sqlite>=1.0.0` and use `SqliteHook` from `airflow.providers.sqlite.hooks.sqlite` instead.
+  = help: Install `apache-airflow-providers-sqlite>=1.0.0` and use `airflow.providers.sqlite.hooks.sqlite.SqliteHook` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_standard.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_standard.py.snap
@@ -10,7 +10,7 @@ AIR302_standard.py:25:1: AIR302 `airflow.operators.bash_operator.BashOperator` i
 26 |
 27 | TriggerDagRunLink()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `BashOperator` from `airflow.providers.standard.operators.bash` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.operators.bash.BashOperator` instead.

 AIR302_standard.py:27:1: AIR302 `airflow.operators.dagrun_operator.TriggerDagRunLink` is moved into `standard` provider in Airflow 3.0;
   |
@@ -21,7 +21,7 @@ AIR302_standard.py:27:1: AIR302 `airflow.operators.dagrun_operator.TriggerDagRun
 28 | TriggerDagRunOperator()
 29 | DummyOperator()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `TriggerDagRunLink` from `airflow.providers.standard.operators.trigger_dagrun` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `airflow.providers.standard.operators.trigger_dagrun.TriggerDagRunLink` instead.

 AIR302_standard.py:28:1: AIR302 `airflow.operators.dagrun_operator.TriggerDagRunOperator` is moved into `standard` provider in Airflow 3.0;
   |
@@ -31,7 +31,7 @@ AIR302_standard.py:28:1: AIR302 `airflow.operators.dagrun_operator.TriggerDagRun
 29 | DummyOperator()
 30 | EmptyOperator()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `TriggerDagRunOperator` from `airflow.providers.standard.operators.trigger_dagrun` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `airflow.providers.standard.operators.trigger_dagrun.TriggerDagRunOperator` instead.

 AIR302_standard.py:29:1: AIR302 `airflow.operators.dummy.DummyOperator` is moved into `standard` provider in Airflow 3.0;
   |
@@ -41,7 +41,7 @@ AIR302_standard.py:29:1: AIR302 `airflow.operators.dummy.DummyOperator` is moved
   | ^^^^^^^^^^^^^ AIR302
 30 | EmptyOperator()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `EmptyOperator` from `airflow.providers.standard.operators.empty` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `airflow.providers.standard.operators.empty.EmptyOperator` instead.

 AIR302_standard.py:30:1: AIR302 `airflow.operators.dummy.EmptyOperator` is moved into `standard` provider in Airflow 3.0;
   |
@@ -52,7 +52,7 @@ AIR302_standard.py:30:1: AIR302 `airflow.operators.dummy.EmptyOperator` is moved
 31 |
 32 | LatestOnlyOperator()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `EmptyOperator` from `airflow.providers.standard.operators.empty` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `airflow.providers.standard.operators.empty.EmptyOperator` instead.

 AIR302_standard.py:32:1: AIR302 `airflow.operators.latest_only_operator.LatestOnlyOperator` is moved into `standard` provider in Airflow 3.0;
   |
@@ -63,7 +63,7 @@ AIR302_standard.py:32:1: AIR302 `airflow.operators.latest_only_operator.LatestOn
 33 |
 34 | BranchPythonOperator()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `LatestOnlyOperator` from `airflow.providers.standard.operators.latest_only` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.operators.latest_only.LatestOnlyOperator` instead.

 AIR302_standard.py:34:1: AIR302 `airflow.operators.python_operator.BranchPythonOperator` is moved into `standard` provider in Airflow 3.0;
   |
@@ -74,7 +74,7 @@ AIR302_standard.py:34:1: AIR302 `airflow.operators.python_operator.BranchPythonO
 35 | PythonOperator()
 36 | PythonVirtualenvOperator()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `BranchPythonOperator` from `airflow.providers.standard.operators.python` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.operators.python.BranchPythonOperator` instead.

 AIR302_standard.py:35:1: AIR302 `airflow.operators.python_operator.PythonOperator` is moved into `standard` provider in Airflow 3.0;
   |
@@ -84,7 +84,7 @@ AIR302_standard.py:35:1: AIR302 `airflow.operators.python_operator.PythonOperato
 36 | PythonVirtualenvOperator()
 37 | ShortCircuitOperator()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonOperator` from `airflow.providers.standard.operators.python` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.operators.python.PythonOperator` instead.

 AIR302_standard.py:36:1: AIR302 `airflow.operators.python_operator.PythonVirtualenvOperator` is moved into `standard` provider in Airflow 3.0;
   |
@@ -94,7 +94,7 @@ AIR302_standard.py:36:1: AIR302 `airflow.operators.python_operator.PythonVirtual
   | ^^^^^^^^^^^^^^^^^^^^^^^^ AIR302
 37 | ShortCircuitOperator()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonVirtualenvOperator` from `airflow.providers.standard.operators.python` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.operators.python.PythonVirtualenvOperator` instead.

 AIR302_standard.py:37:1: AIR302 `airflow.operators.python_operator.ShortCircuitOperator` is moved into `standard` provider in Airflow 3.0;
   |
@@ -105,7 +105,7 @@ AIR302_standard.py:37:1: AIR302 `airflow.operators.python_operator.ShortCircuitO
 38 |
 39 | ExternalTaskMarker()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `ShortCircuitOperator` from `airflow.providers.standard.operators.python` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.operators.python.ShortCircuitOperator` instead.

 AIR302_standard.py:39:1: AIR302 `airflow.sensors.external_task_sensor.ExternalTaskMarker` is moved into `standard` provider in Airflow 3.0;
   |
@@ -116,7 +116,7 @@ AIR302_standard.py:39:1: AIR302 `airflow.sensors.external_task_sensor.ExternalTa
 40 | ExternalTaskSensor()
 41 | ExternalTaskSensorLink()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalTaskMarker` from `airflow.providers.standard.sensors.external_task` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.sensors.external_task.ExternalTaskMarker` instead.

 AIR302_standard.py:40:1: AIR302 `airflow.sensors.external_task_sensor.ExternalTaskSensor` is moved into `standard` provider in Airflow 3.0;
   |
@@ -125,7 +125,7 @@ AIR302_standard.py:40:1: AIR302 `airflow.sensors.external_task_sensor.ExternalTa
   | ^^^^^^^^^^^^^^^^^^ AIR302
 41 | ExternalTaskSensorLink()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalTaskSensor` from `airflow.providers.standard.sensors.external_task` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.sensors.external_task.ExternalTaskSensor` instead.

 AIR302_standard.py:41:1: AIR302 `airflow.sensors.external_task_sensor.ExternalTaskSensorLink` is moved into `standard` provider in Airflow 3.0;
   |
@@ -136,7 +136,7 @@ AIR302_standard.py:41:1: AIR302 `airflow.sensors.external_task_sensor.ExternalTa
 42 |
 43 | from airflow.operators.dummy_operator import (
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalTaskSensorLink` from `airflow.providers.standard.sensors.external_task` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.sensors.external_task.ExternalTaskSensorLink` instead.

 AIR302_standard.py:48:1: AIR302 `airflow.operators.dummy_operator.DummyOperator` is moved into `standard` provider in Airflow 3.0;
   |
@@ -146,7 +146,7 @@ AIR302_standard.py:48:1: AIR302 `airflow.operators.dummy_operator.DummyOperator`
   | ^^^^^^^^^^^^^ AIR302
 49 | EmptyOperator()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `EmptyOperator` from `airflow.providers.standard.operators.empty` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `airflow.providers.standard.operators.empty.EmptyOperator` instead.

 AIR302_standard.py:49:1: AIR302 `airflow.operators.dummy_operator.EmptyOperator` is moved into `standard` provider in Airflow 3.0;
   |
@@ -156,7 +156,7 @@ AIR302_standard.py:49:1: AIR302 `airflow.operators.dummy_operator.EmptyOperator`
 50 |
 51 | from airflow.hooks.subprocess import SubprocessResult
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `EmptyOperator` from `airflow.providers.standard.operators.empty` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `airflow.providers.standard.operators.empty.EmptyOperator` instead.

 AIR302_standard.py:52:1: AIR302 `airflow.hooks.subprocess.SubprocessResult` is moved into `standard` provider in Airflow 3.0;
   |
@@ -166,7 +166,7 @@ AIR302_standard.py:52:1: AIR302 `airflow.hooks.subprocess.SubprocessResult` is m
 53 | from airflow.hooks.subprocess import working_directory
 54 | working_directory()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `SubprocessResult` from `airflow.providers.standard.hooks.subprocess` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.hooks.subprocess.SubprocessResult` instead.

 AIR302_standard.py:54:1: AIR302 `airflow.hooks.subprocess.working_directory` is moved into `standard` provider in Airflow 3.0;
   |
@@ -177,7 +177,7 @@ AIR302_standard.py:54:1: AIR302 `airflow.hooks.subprocess.working_directory` is
 55 | from airflow.operators.datetime import target_times_as_dates
 56 | target_times_as_dates()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `working_directory` from `airflow.providers.standard.hooks.subprocess` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.hooks.subprocess.working_directory` instead.

 AIR302_standard.py:56:1: AIR302 `airflow.operators.datetime.target_times_as_dates` is moved into `standard` provider in Airflow 3.0;
   |
@@ -188,7 +188,7 @@ AIR302_standard.py:56:1: AIR302 `airflow.operators.datetime.target_times_as_date
 57 | from airflow.operators.trigger_dagrun import TriggerDagRunLink
 58 | TriggerDagRunLink()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `target_times_as_dates` from `airflow.providers.standard.operators.datetime` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.operators.datetime.target_times_as_dates` instead.

 AIR302_standard.py:58:1: AIR302 `airflow.operators.trigger_dagrun.TriggerDagRunLink` is moved into `standard` provider in Airflow 3.0;
   |
@@ -199,7 +199,7 @@ AIR302_standard.py:58:1: AIR302 `airflow.operators.trigger_dagrun.TriggerDagRunL
 59 | from airflow.sensors.external_task import ExternalTaskSensorLink
 60 | ExternalTaskSensorLink()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `TriggerDagRunLink` from `airflow.providers.standard.operators.trigger_dagrun` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `airflow.providers.standard.operators.trigger_dagrun.TriggerDagRunLink` instead.

 AIR302_standard.py:60:1: AIR302 [*] `airflow.sensors.external_task.ExternalTaskSensorLink` is moved into `standard` provider in Airflow 3.0;
   |
@@ -210,7 +210,7 @@ AIR302_standard.py:60:1: AIR302 [*] `airflow.sensors.external_task.ExternalTaskS
 61 | from airflow.sensors.time_delta import WaitSensor
 62 | WaitSensor()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalDagLink` from `airflow.providers.standard.sensors.external_task` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.sensors.external_task.ExternalDagLink` instead.

 ℹ Safe fix
 57 57 | from airflow.operators.trigger_dagrun import TriggerDagRunLink
@@ -229,4 +229,4 @@ AIR302_standard.py:62:1: AIR302 `airflow.sensors.time_delta.WaitSensor` is moved
 62 | WaitSensor()
   | ^^^^^^^^^^ AIR302
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `WaitSensor` from `airflow.providers.standard.sensors.time_delta` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.sensors.time_delta.WaitSensor` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_zendesk.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR302_AIR302_zendesk.py.snap
@@ -8,4 +8,4 @@ AIR302_zendesk.py:5:1: AIR302 `airflow.hooks.zendesk_hook.ZendeskHook` is moved
 5 | ZendeskHook()
  | ^^^^^^^^^^^ AIR302
  |
-  = help: Install `apache-airflow-providers-zendesk>=1.0.0` and use `ZendeskHook` from `airflow.providers.zendesk.hooks.zendesk` instead.
+  = help: Install `apache-airflow-providers-zendesk>=1.0.0` and use `airflow.providers.zendesk.hooks.zendesk.ZendeskHook` instead.
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR311_AIR311_names.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR311_AIR311_names.py.snap
@@ -9,7 +9,7 @@ AIR311_names.py:27:1: AIR311 [*] `airflow.Dataset` is removed in Airflow 3.0; It
 28 |
 29 | # airflow.datasets
   |
-   = help: Use `Asset` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.Asset` instead

 ℹ Safe fix
 22 22 | from airflow.models.dag import DAG as DAGFromDag
@@ -32,7 +32,7 @@ AIR311_names.py:30:1: AIR311 [*] `airflow.datasets.Dataset` is removed in Airflo
 31 | DatasetAlias()
 32 | DatasetAll()
   |
-   = help: Use `Asset` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.Asset` instead

 ℹ Safe fix
 22 22 | from airflow.models.dag import DAG as DAGFromDag
@@ -59,7 +59,7 @@ AIR311_names.py:31:1: AIR311 [*] `airflow.datasets.DatasetAlias` is removed in A
 32 | DatasetAll()
 33 | DatasetAny()
   |
-   = help: Use `AssetAlias` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.AssetAlias` instead

 ℹ Safe fix
 22 22 | from airflow.models.dag import DAG as DAGFromDag
@@ -87,7 +87,7 @@ AIR311_names.py:32:1: AIR311 [*] `airflow.datasets.DatasetAll` is removed in Air
 33 | DatasetAny()
 34 | Metadata()
   |
-   = help: Use `AssetAll` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.AssetAll` instead

 ℹ Safe fix
 22 22 | from airflow.models.dag import DAG as DAGFromDag
@@ -116,7 +116,7 @@ AIR311_names.py:33:1: AIR311 [*] `airflow.datasets.DatasetAny` is removed in Air
 34 | Metadata()
 35 | expand_alias_to_datasets()
   |
-   = help: Use `AssetAny` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.AssetAny` instead

 ℹ Safe fix
 22 22 | from airflow.models.dag import DAG as DAGFromDag
@@ -144,7 +144,7 @@ AIR311_names.py:34:1: AIR311 `airflow.datasets.metadata.Metadata` is removed in
   | ^^^^^^^^ AIR311
 35 | expand_alias_to_datasets()
   |
-   = help: Use `Metadata` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.Metadata` instead

 AIR311_names.py:35:1: AIR311 [*] `airflow.datasets.expand_alias_to_datasets` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -155,7 +155,7 @@ AIR311_names.py:35:1: AIR311 [*] `airflow.datasets.expand_alias_to_datasets` is
 36 |
 37 | # airflow.decorators
   |
-   = help: Use `expand_alias_to_assets` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.expand_alias_to_assets` instead

 ℹ Safe fix
 22 22 | from airflow.models.dag import DAG as DAGFromDag
@@ -183,7 +183,7 @@ AIR311_names.py:38:1: AIR311 `airflow.decorators.dag` is removed in Airflow 3.0;
 39 | task()
 40 | task_group()
   |
-   = help: Use `dag` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.dag` instead

 AIR311_names.py:39:1: AIR311 `airflow.decorators.task` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -194,7 +194,7 @@ AIR311_names.py:39:1: AIR311 `airflow.decorators.task` is removed in Airflow 3.0
 40 | task_group()
 41 | setup()
   |
-   = help: Use `task` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.task` instead

 AIR311_names.py:40:1: AIR311 `airflow.decorators.task_group` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -205,7 +205,7 @@ AIR311_names.py:40:1: AIR311 `airflow.decorators.task_group` is removed in Airfl
 41 | setup()
 42 | teardown()
   |
-   = help: Use `task_group` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.task_group` instead

 AIR311_names.py:41:1: AIR311 `airflow.decorators.setup` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -215,7 +215,7 @@ AIR311_names.py:41:1: AIR311 `airflow.decorators.setup` is removed in Airflow 3.
   | ^^^^^ AIR311
 42 | teardown()
   |
-   = help: Use `setup` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.setup` instead

 AIR311_names.py:42:1: AIR311 `airflow.decorators.teardown` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -226,7 +226,7 @@ AIR311_names.py:42:1: AIR311 `airflow.decorators.teardown` is removed in Airflow
 43 |
 44 | # airflow.io
   |
-   = help: Use `teardown` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.teardown` instead

 AIR311_names.py:45:1: AIR311 `airflow.io.path.ObjectStoragePath` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -235,7 +235,7 @@ AIR311_names.py:45:1: AIR311 `airflow.io.path.ObjectStoragePath` is removed in A
   | ^^^^^^^^^^^^^^^^^ AIR311
 46 | attach()
   |
-   = help: Use `ObjectStoragePath` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.ObjectStoragePath` instead

 AIR311_names.py:46:1: AIR311 `airflow.io.storage.attach` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -246,7 +246,7 @@ AIR311_names.py:46:1: AIR311 `airflow.io.storage.attach` is removed in Airflow 3
 47 |
 48 | # airflow.models
   |
-   = help: Use `attach` from `airflow.sdk.io` instead.
+   = help: Use `airflow.sdk.io.attach` instead

 AIR311_names.py:49:1: AIR311 `airflow.models.Connection` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -256,7 +256,7 @@ AIR311_names.py:49:1: AIR311 `airflow.models.Connection` is removed in Airflow 3
 50 | DAGFromModel()
 51 | Variable()
   |
-   = help: Use `Connection` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.Connection` instead

 AIR311_names.py:50:1: AIR311 [*] `airflow.models.DAG` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -266,7 +266,7 @@ AIR311_names.py:50:1: AIR311 [*] `airflow.models.DAG` is removed in Airflow 3.0;
   | ^^^^^^^^^^^^ AIR311
 51 | Variable()
   |
-   = help: Use `DAG` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.DAG` instead

 ℹ Safe fix
 22 22 | from airflow.models.dag import DAG as DAGFromDag
@@ -295,7 +295,7 @@ AIR311_names.py:51:1: AIR311 `airflow.models.Variable` is removed in Airflow 3.0
 52 |
 53 | # airflow.models.baseoperator
   |
-   = help: Use `Variable` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.Variable` instead

 AIR311_names.py:54:1: AIR311 `airflow.models.baseoperator.chain` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -305,7 +305,7 @@ AIR311_names.py:54:1: AIR311 `airflow.models.baseoperator.chain` is removed in A
 55 | chain_linear()
 56 | cross_downstream()
   |
-   = help: Use `chain` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.chain` instead

 AIR311_names.py:55:1: AIR311 `airflow.models.baseoperator.chain_linear` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -315,7 +315,7 @@ AIR311_names.py:55:1: AIR311 `airflow.models.baseoperator.chain_linear` is remov
   | ^^^^^^^^^^^^ AIR311
 56 | cross_downstream()
   |
-   = help: Use `chain_linear` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.chain_linear` instead

 AIR311_names.py:56:1: AIR311 `airflow.models.baseoperator.cross_downstream` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -326,7 +326,7 @@ AIR311_names.py:56:1: AIR311 `airflow.models.baseoperator.cross_downstream` is r
 57 |
 58 | # airflow.models.baseoperatolinker
   |
-   = help: Use `cross_downstream` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.cross_downstream` instead

 AIR311_names.py:59:1: AIR311 `airflow.models.baseoperatorlink.BaseOperatorLink` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -336,7 +336,7 @@ AIR311_names.py:59:1: AIR311 `airflow.models.baseoperatorlink.BaseOperatorLink`
 60 |
 61 | # airflow.models.dag
   |
-   = help: Use `BaseOperatorLink` from `airflow.sdk.definitions.baseoperatorlink` instead.
+   = help: Use `airflow.sdk.definitions.baseoperatorlink.BaseOperatorLink` instead

 AIR311_names.py:62:1: AIR311 [*] `airflow.models.dag.DAG` is removed in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -346,7 +346,7 @@ AIR311_names.py:62:1: AIR311 [*] `airflow.models.dag.DAG` is removed in Airflow
 63 | # airflow.timetables.datasets
 64 | DatasetOrTimeSchedule()
   |
-   = help: Use `DAG` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.DAG` instead

 ℹ Safe fix
 22 22 | from airflow.models.dag import DAG as DAGFromDag
@@ -375,7 +375,7 @@ AIR311_names.py:64:1: AIR311 [*] `airflow.timetables.datasets.DatasetOrTimeSched
 65 |
 66 | # airflow.utils.dag_parsing_context
   |
-   = help: Use `AssetOrTimeSchedule` from `airflow.timetables.assets` instead.
+   = help: Use `airflow.timetables.assets.AssetOrTimeSchedule` instead

 ℹ Safe fix
 22 22 | from airflow.models.dag import DAG as DAGFromDag
@@ -401,4 +401,4 @@ AIR311_names.py:67:1: AIR311 `airflow.utils.dag_parsing_context.get_parsing_cont
 67 | get_parsing_context()
   | ^^^^^^^^^^^^^^^^^^^ AIR311
   |
-   = help: Use `get_parsing_context` from `airflow.sdk` instead.
+   = help: Use `airflow.sdk.get_parsing_context` instead
--- a/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR312_AIR312.py.snap
+++ b/crates/ruff_linter/src/rules/airflow/snapshots/ruff_linterrulesairflowtestsAIR312_AIR312.py.snap
@@ -10,7 +10,7 @@ AIR312.py:32:1: AIR312 `airflow.hooks.filesystem.FSHook` is deprecated and moved
 33 | PackageIndexHook()
 34 | SubprocessHook()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `FSHook` from `airflow.providers.standard.hooks.filesystem` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.hooks.filesystem.FSHook` instead.

 AIR312.py:33:1: AIR312 `airflow.hooks.package_index.PackageIndexHook` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -20,7 +20,7 @@ AIR312.py:33:1: AIR312 `airflow.hooks.package_index.PackageIndexHook` is depreca
 34 | SubprocessHook()
 35 | BashOperator()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `PackageIndexHook` from `airflow.providers.standard.hooks.package_index` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.hooks.package_index.PackageIndexHook` instead.

 AIR312.py:34:1: AIR312 `airflow.hooks.subprocess.SubprocessHook` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -31,7 +31,7 @@ AIR312.py:34:1: AIR312 `airflow.hooks.subprocess.SubprocessHook` is deprecated a
 35 | BashOperator()
 36 | BranchDateTimeOperator()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `SubprocessHook` from `airflow.providers.standard.hooks.subprocess` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.hooks.subprocess.SubprocessHook` instead.

 AIR312.py:35:1: AIR312 `airflow.operators.bash.BashOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -42,7 +42,7 @@ AIR312.py:35:1: AIR312 `airflow.operators.bash.BashOperator` is deprecated and m
 36 | BranchDateTimeOperator()
 37 | TriggerDagRunOperator()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `BashOperator` from `airflow.providers.standard.operators.bash` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.operators.bash.BashOperator` instead.

 AIR312.py:36:1: AIR312 `airflow.operators.datetime.BranchDateTimeOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -53,7 +53,7 @@ AIR312.py:36:1: AIR312 `airflow.operators.datetime.BranchDateTimeOperator` is de
 37 | TriggerDagRunOperator()
 38 | EmptyOperator()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `BranchDateTimeOperator` from `airflow.providers.standard.operators.datetime` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.operators.datetime.BranchDateTimeOperator` instead.

 AIR312.py:37:1: AIR312 `airflow.operators.trigger_dagrun.TriggerDagRunOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -64,7 +64,7 @@ AIR312.py:37:1: AIR312 `airflow.operators.trigger_dagrun.TriggerDagRunOperator`
 38 | EmptyOperator()
 39 | LatestOnlyOperator()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `TriggerDagRunOperator` from `airflow.providers.standard.operators.trigger_dagrun` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `airflow.providers.standard.operators.trigger_dagrun.TriggerDagRunOperator` instead.

 AIR312.py:38:1: AIR312 `airflow.operators.empty.EmptyOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -75,7 +75,7 @@ AIR312.py:38:1: AIR312 `airflow.operators.empty.EmptyOperator` is deprecated and
 39 | LatestOnlyOperator()
 40 | (
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `EmptyOperator` from `airflow.providers.standard.operators.empty` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `airflow.providers.standard.operators.empty.EmptyOperator` instead.

 AIR312.py:39:1: AIR312 `airflow.operators.latest_only.LatestOnlyOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -86,7 +86,7 @@ AIR312.py:39:1: AIR312 `airflow.operators.latest_only.LatestOnlyOperator` is dep
 40 | (
 41 |     BranchPythonOperator(),
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `LatestOnlyOperator` from `airflow.providers.standard.operators.latest_only` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.operators.latest_only.LatestOnlyOperator` instead.

 AIR312.py:41:5: AIR312 `airflow.operators.python.BranchPythonOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -97,7 +97,7 @@ AIR312.py:41:5: AIR312 `airflow.operators.python.BranchPythonOperator` is deprec
 42 |     PythonOperator(),
 43 |     PythonVirtualenvOperator(),
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `BranchPythonOperator` from `airflow.providers.standard.operators.python` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.operators.python.BranchPythonOperator` instead.

 AIR312.py:42:5: AIR312 `airflow.operators.python.PythonOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -108,7 +108,7 @@ AIR312.py:42:5: AIR312 `airflow.operators.python.PythonOperator` is deprecated a
 43 |     PythonVirtualenvOperator(),
 44 |     ShortCircuitOperator(),
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonOperator` from `airflow.providers.standard.operators.python` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.operators.python.PythonOperator` instead.

 AIR312.py:43:5: AIR312 `airflow.operators.python.PythonVirtualenvOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -119,7 +119,7 @@ AIR312.py:43:5: AIR312 `airflow.operators.python.PythonVirtualenvOperator` is de
 44 |     ShortCircuitOperator(),
 45 | )
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `PythonVirtualenvOperator` from `airflow.providers.standard.operators.python` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.operators.python.PythonVirtualenvOperator` instead.

 AIR312.py:44:5: AIR312 `airflow.operators.python.ShortCircuitOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -130,7 +130,7 @@ AIR312.py:44:5: AIR312 `airflow.operators.python.ShortCircuitOperator` is deprec
 45 | )
 46 | BranchDayOfWeekOperator()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `ShortCircuitOperator` from `airflow.providers.standard.operators.python` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.operators.python.ShortCircuitOperator` instead.

 AIR312.py:46:1: AIR312 `airflow.operators.weekday.BranchDayOfWeekOperator` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -141,7 +141,7 @@ AIR312.py:46:1: AIR312 `airflow.operators.weekday.BranchDayOfWeekOperator` is de
 47 | DateTimeSensor(), DateTimeSensorAsync()
 48 | ExternalTaskMarker(), ExternalTaskSensor()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `BranchDayOfWeekOperator` from `airflow.providers.standard.operators.weekday` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.operators.weekday.BranchDayOfWeekOperator` instead.

 AIR312.py:47:1: AIR312 `airflow.sensors.date_time.DateTimeSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -152,7 +152,7 @@ AIR312.py:47:1: AIR312 `airflow.sensors.date_time.DateTimeSensor` is deprecated
 48 | ExternalTaskMarker(), ExternalTaskSensor()
 49 | FileSensor()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `DateTimeSensor` from `airflow.providers.standard.sensors.date_time` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.sensors.date_time.DateTimeSensor` instead.

 AIR312.py:47:19: AIR312 `airflow.sensors.date_time.DateTimeSensorAsync` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -163,7 +163,7 @@ AIR312.py:47:19: AIR312 `airflow.sensors.date_time.DateTimeSensorAsync` is depre
 48 | ExternalTaskMarker(), ExternalTaskSensor()
 49 | FileSensor()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `DateTimeSensorAsync` from `airflow.providers.standard.sensors.date_time` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.sensors.date_time.DateTimeSensorAsync` instead.

 AIR312.py:48:1: AIR312 `airflow.sensors.external_task.ExternalTaskMarker` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -174,7 +174,7 @@ AIR312.py:48:1: AIR312 `airflow.sensors.external_task.ExternalTaskMarker` is dep
 49 | FileSensor()
 50 | TimeSensor(), TimeSensorAsync()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalTaskMarker` from `airflow.providers.standard.sensors.external_task` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.sensors.external_task.ExternalTaskMarker` instead.

 AIR312.py:48:23: AIR312 `airflow.sensors.external_task.ExternalTaskSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -185,7 +185,7 @@ AIR312.py:48:23: AIR312 `airflow.sensors.external_task.ExternalTaskSensor` is de
 49 | FileSensor()
 50 | TimeSensor(), TimeSensorAsync()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `ExternalTaskSensor` from `airflow.providers.standard.sensors.external_task` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.sensors.external_task.ExternalTaskSensor` instead.

 AIR312.py:49:1: AIR312 `airflow.sensors.filesystem.FileSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -196,7 +196,7 @@ AIR312.py:49:1: AIR312 `airflow.sensors.filesystem.FileSensor` is deprecated and
 50 | TimeSensor(), TimeSensorAsync()
 51 | TimeDeltaSensor(), TimeDeltaSensorAsync()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `FileSensor` from `airflow.providers.standard.sensors.filesystem` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.2` and use `airflow.providers.standard.sensors.filesystem.FileSensor` instead.

 AIR312.py:50:1: AIR312 `airflow.sensors.time_sensor.TimeSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -207,7 +207,7 @@ AIR312.py:50:1: AIR312 `airflow.sensors.time_sensor.TimeSensor` is deprecated an
 51 | TimeDeltaSensor(), TimeDeltaSensorAsync()
 52 | DayOfWeekSensor()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `TimeSensor` from `airflow.providers.standard.sensors.time` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.sensors.time.TimeSensor` instead.

 AIR312.py:50:15: AIR312 `airflow.sensors.time_sensor.TimeSensorAsync` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -218,7 +218,7 @@ AIR312.py:50:15: AIR312 `airflow.sensors.time_sensor.TimeSensorAsync` is depreca
 51 | TimeDeltaSensor(), TimeDeltaSensorAsync()
 52 | DayOfWeekSensor()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `TimeSensorAsync` from `airflow.providers.standard.sensors.time` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.sensors.time.TimeSensorAsync` instead.

 AIR312.py:51:1: AIR312 `airflow.sensors.time_delta.TimeDeltaSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -229,7 +229,7 @@ AIR312.py:51:1: AIR312 `airflow.sensors.time_delta.TimeDeltaSensor` is deprecate
 52 | DayOfWeekSensor()
 53 | DagStateTrigger(), WorkflowTrigger()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `TimeDeltaSensor` from `airflow.providers.standard.sensors.time_delta` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.sensors.time_delta.TimeDeltaSensor` instead.

 AIR312.py:51:20: AIR312 `airflow.sensors.time_delta.TimeDeltaSensorAsync` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -240,7 +240,7 @@ AIR312.py:51:20: AIR312 `airflow.sensors.time_delta.TimeDeltaSensorAsync` is dep
 52 | DayOfWeekSensor()
 53 | DagStateTrigger(), WorkflowTrigger()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `TimeDeltaSensorAsync` from `airflow.providers.standard.sensors.time_delta` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.sensors.time_delta.TimeDeltaSensorAsync` instead.

 AIR312.py:52:1: AIR312 `airflow.sensors.weekday.DayOfWeekSensor` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -251,7 +251,7 @@ AIR312.py:52:1: AIR312 `airflow.sensors.weekday.DayOfWeekSensor` is deprecated a
 53 | DagStateTrigger(), WorkflowTrigger()
 54 | FileTrigger()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `DayOfWeekSensor` from `airflow.providers.standard.sensors.weekday` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.1` and use `airflow.providers.standard.sensors.weekday.DayOfWeekSensor` instead.

 AIR312.py:53:1: AIR312 `airflow.triggers.external_task.DagStateTrigger` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -262,7 +262,7 @@ AIR312.py:53:1: AIR312 `airflow.triggers.external_task.DagStateTrigger` is depre
 54 | FileTrigger()
 55 | DateTimeTrigger(), TimeDeltaTrigger()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `DagStateTrigger` from `airflow.providers.standard.triggers.external_task` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.triggers.external_task.DagStateTrigger` instead.

 AIR312.py:53:20: AIR312 `airflow.triggers.external_task.WorkflowTrigger` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -273,7 +273,7 @@ AIR312.py:53:20: AIR312 `airflow.triggers.external_task.WorkflowTrigger` is depr
 54 | FileTrigger()
 55 | DateTimeTrigger(), TimeDeltaTrigger()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `WorkflowTrigger` from `airflow.providers.standard.triggers.external_task` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.triggers.external_task.WorkflowTrigger` instead.

 AIR312.py:54:1: AIR312 `airflow.triggers.file.FileTrigger` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -283,7 +283,7 @@ AIR312.py:54:1: AIR312 `airflow.triggers.file.FileTrigger` is deprecated and mov
   | ^^^^^^^^^^^ AIR312
 55 | DateTimeTrigger(), TimeDeltaTrigger()
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `FileTrigger` from `airflow.providers.standard.triggers.file` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.triggers.file.FileTrigger` instead.

 AIR312.py:55:1: AIR312 `airflow.triggers.temporal.DateTimeTrigger` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -292,7 +292,7 @@ AIR312.py:55:1: AIR312 `airflow.triggers.temporal.DateTimeTrigger` is deprecated
 55 | DateTimeTrigger(), TimeDeltaTrigger()
   | ^^^^^^^^^^^^^^^ AIR312
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `DateTimeTrigger` from `airflow.providers.standard.triggers.temporal` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.triggers.temporal.DateTimeTrigger` instead.

 AIR312.py:55:20: AIR312 `airflow.triggers.temporal.TimeDeltaTrigger` is deprecated and moved into `standard` provider in Airflow 3.0; It still works in Airflow 3.0 but is expected to be removed in a future version.
   |
@@ -301,4 +301,4 @@ AIR312.py:55:20: AIR312 `airflow.triggers.temporal.TimeDeltaTrigger` is deprecat
 55 | DateTimeTrigger(), TimeDeltaTrigger()
   |                    ^^^^^^^^^^^^^^^^ AIR312
   |
-   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `TimeDeltaTrigger` from `airflow.providers.standard.triggers.temporal` instead.
+   = help: Install `apache-airflow-providers-standard>=0.0.3` and use `airflow.providers.standard.triggers.temporal.TimeDeltaTrigger` instead.
--- a/crates/ruff_linter/src/rules/flake8_2020/rules/compare.rs
+++ b/crates/ruff_linter/src/rules/flake8_2020/rules/compare.rs
@@ -52,20 +52,17 @@ impl Violation for SysVersionCmpStr3 {

 /// ## What it does
 /// Checks for equality comparisons against the major version returned by
-/// `sys.version_info` (e.g., `sys.version_info[0] == 3` or `sys.version_info[0] != 3`).
+/// `sys.version_info` (e.g., `sys.version_info[0] == 3`).
 ///
 /// ## Why is this bad?
 /// Using `sys.version_info[0] == 3` to verify that the major version is
 /// Python 3 or greater will fail if the major version number is ever
 /// incremented (e.g., to Python 4). This is likely unintended, as code
 /// that uses this comparison is likely intended to be run on Python 2,
-/// but would now run on Python 4 too. Similarly, using `sys.version_info[0] != 3`
-/// to check for Python 2 will also fail if the major version number is
-/// incremented.
+/// but would now run on Python 4 too.
 ///
 /// Instead, use `>=` to check if the major version number is 3 or greater,
-/// or `<` to check if the major version number is less than 3, to future-proof
-/// the code.
+/// to future-proof the code.
 ///
 /// ## Example
 /// ```python
@@ -91,18 +88,12 @@ impl Violation for SysVersionCmpStr3 {
 /// - [Python documentation: `sys.version`](https://docs.python.org/3/library/sys.html#sys.version)
 /// - [Python documentation: `sys.version_info`](https://docs.python.org/3/library/sys.html#sys.version_info)
 #[derive(ViolationMetadata)]
-pub(crate) struct SysVersionInfo0Eq3 {
-    eq: bool,
-}
+pub(crate) struct SysVersionInfo0Eq3;

 impl Violation for SysVersionInfo0Eq3 {
    #[derive_message_formats]
    fn message(&self) -> String {
-        if self.eq {
-            "`sys.version_info[0] == 3` referenced (python4), use `>=`".to_string()
-        } else {
-            "`sys.version_info[0] != 3` referenced (python4), use `<`".to_string()
-        }
+        "`sys.version_info[0] == 3` referenced (python4), use `>=`".to_string()
    }
 }

@@ -244,7 +235,7 @@ pub(crate) fn compare(checker: &Checker, left: &Expr, ops: &[CmpOp], comparators
            {
                if *i == 0 {
                    if let (
-                        [operator @ (CmpOp::Eq | CmpOp::NotEq)],
+                        [CmpOp::Eq | CmpOp::NotEq],
                        [
                            Expr::NumberLiteral(ast::ExprNumberLiteral {
                                value: ast::Number::Int(n),
@@ -255,9 +246,7 @@ pub(crate) fn compare(checker: &Checker, left: &Expr, ops: &[CmpOp], comparators
                    {
                        if *n == 3 && checker.enabled(Rule::SysVersionInfo0Eq3) {
                            checker.report_diagnostic(Diagnostic::new(
-                                SysVersionInfo0Eq3 {
-                                    eq: matches!(*operator, CmpOp::Eq),
-                                },
+                                SysVersionInfo0Eq3,
                                left.range(),
                            ));
                        }
--- a/crates/ruff_linter/src/rules/flake8_2020/snapshots/ruff_linterrulesflake8_2020testsYTT201_YTT201.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_2020/snapshots/ruff_linterrulesflake8_2020testsYTT201_YTT201.py.snap
@@ -20,7 +20,7 @@ YTT201.py:8:7: YTT201 `sys.version_info[0] == 3` referenced (python4), use `>=`
 10 | PY2 = version_info[0] != 3
   |

-YTT201.py:9:7: YTT201 `sys.version_info[0] != 3` referenced (python4), use `<`
+YTT201.py:9:7: YTT201 `sys.version_info[0] == 3` referenced (python4), use `>=`
   |
 7 | PY3 = sys.version_info[0] == 3
 8 | PY3 = version_info[0] == 3
@@ -29,7 +29,7 @@ YTT201.py:9:7: YTT201 `sys.version_info[0] != 3` referenced (python4), use `<`
 10 | PY2 = version_info[0] != 3
   |

-YTT201.py:10:7: YTT201 `sys.version_info[0] != 3` referenced (python4), use `<`
+YTT201.py:10:7: YTT201 `sys.version_info[0] == 3` referenced (python4), use `>=`
   |
 8 | PY3 = version_info[0] == 3
 9 | PY2 = sys.version_info[0] != 3
--- a/crates/ruff_linter/src/rules/flake8_async/rules/async_zero_sleep.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/async_zero_sleep.rs
@@ -62,25 +62,7 @@ pub(crate) fn async_zero_sleep(checker: &Checker, call: &ExprCall) {
        return;
    }

-    let Some(qualified_name) = checker
-        .semantic()
-        .resolve_qualified_name(call.func.as_ref())
-    else {
-        return;
-    };
-
-    let Some(module) = AsyncModule::try_from(&qualified_name) else {
-        return;
-    };
-
-    // Determine the correct argument name
-    let arg_name = match module {
-        AsyncModule::Trio => "seconds",
-        AsyncModule::AnyIo => "delay",
-        AsyncModule::AsyncIo => return,
-    };
-
-    let Some(arg) = call.arguments.find_argument_value(arg_name, 0) else {
+    let Some(arg) = call.arguments.find_argument_value("seconds", 0) else {
        return;
    };

--- a/crates/ruff_linter/src/rules/flake8_async/rules/long_sleep_not_forever.rs
+++ b/crates/ruff_linter/src/rules/flake8_async/rules/long_sleep_not_forever.rs
@@ -71,25 +71,7 @@ pub(crate) fn long_sleep_not_forever(checker: &Checker, call: &ExprCall) {
        return;
    }

-    let Some(qualified_name) = checker
-        .semantic()
-        .resolve_qualified_name(call.func.as_ref())
-    else {
-        return;
-    };
-
-    let Some(module) = AsyncModule::try_from(&qualified_name) else {
-        return;
-    };
-
-    // Determine the correct argument name
-    let arg_name = match module {
-        AsyncModule::Trio => "seconds",
-        AsyncModule::AnyIo => "delay",
-        AsyncModule::AsyncIo => return,
-    };
-
-    let Some(arg) = call.arguments.find_argument_value(arg_name, 0) else {
+    let Some(arg) = call.arguments.find_argument_value("seconds", 0) else {
        return;
    };

--- a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linterrulesflake8_asynctestsASYNC115_ASYNC115.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linterrulesflake8_asynctestsASYNC115_ASYNC115.py.snap
@@ -214,41 +214,3 @@ ASYNC115.py:128:15: ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `a
 129 129 | 
 130 130 | 
 131 131 | def func():
-
-ASYNC115.py:156:11: ASYNC115 [*] Use `anyio.lowlevel.checkpoint()` instead of `anyio.sleep(0)`
-    |
-154 |     await anyio.sleep(seconds=1)  # OK
-155 |
-156 |     await anyio.sleep(delay=0)  # ASYNC115
-    |           ^^^^^^^^^^^^^^^^^^^^ ASYNC115
-157 |     await anyio.sleep(seconds=0)  # OK
-    |
-    = help: Replace with `anyio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-153 153 |     await anyio.sleep(delay=1)  # OK
-154 154 |     await anyio.sleep(seconds=1)  # OK
-155 155 | 
-156     |-    await anyio.sleep(delay=0)  # ASYNC115
-    156 |+    await anyio.lowlevel.checkpoint()  # ASYNC115
-157 157 |     await anyio.sleep(seconds=0)  # OK
-158 158 | 
-159 159 | 
-
-ASYNC115.py:166:11: ASYNC115 [*] Use `trio.lowlevel.checkpoint()` instead of `trio.sleep(0)`
-    |
-164 |     await trio.sleep(delay=1)  # OK
-165 |
-166 |     await trio.sleep(seconds=0)  # ASYNC115
-    |           ^^^^^^^^^^^^^^^^^^^^^ ASYNC115
-167 |     await trio.sleep(delay=0)  # OK
-    |
-    = help: Replace with `trio.lowlevel.checkpoint()`
-
-ℹ Safe fix
-163 163 |     await trio.sleep(seconds=1)  # OK
-164 164 |     await trio.sleep(delay=1)  # OK
-165 165 | 
-166     |-    await trio.sleep(seconds=0)  # ASYNC115
-    166 |+    await trio.lowlevel.checkpoint()  # ASYNC115
-167 167 |     await trio.sleep(delay=0)  # OK
--- a/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linterrulesflake8_asynctestsASYNC116_ASYNC116.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_async/snapshots/ruff_linterrulesflake8_asynctestsASYNC116_ASYNC116.py.snap
@@ -289,44 +289,3 @@ ASYNC116.py:110:11: ASYNC116 [*] `anyio.sleep()` with >24 hour interval should u
 109 110 |     # catch from import
 110     |-    await sleep(86401)  # error: 116, "async"
    111 |+    await sleep_forever()  # error: 116, "async"
-111 112 | 
-112 113 | 
-113 114 | async def test_anyio_async116_helpers():
-
-ASYNC116.py:119:11: ASYNC116 [*] `anyio.sleep()` with >24 hour interval should usually be `anyio.sleep_forever()`
-    |
-117 |     await anyio.sleep(seconds=1)  # OK
-118 |
-119 |     await anyio.sleep(delay=86401)  # ASYNC116
-    |           ^^^^^^^^^^^^^^^^^^^^^^^^ ASYNC116
-120 |     await anyio.sleep(seconds=86401)  # OK
-    |
-    = help: Replace with `anyio.sleep_forever()`
-
-ℹ Unsafe fix
-116 116 |     await anyio.sleep(delay=1)  # OK
-117 117 |     await anyio.sleep(seconds=1)  # OK
-118 118 | 
-119     |-    await anyio.sleep(delay=86401)  # ASYNC116
-    119 |+    await anyio.sleep_forever()  # ASYNC116
-120 120 |     await anyio.sleep(seconds=86401)  # OK
-121 121 | 
-122 122 | 
-
-ASYNC116.py:129:11: ASYNC116 [*] `trio.sleep()` with >24 hour interval should usually be `trio.sleep_forever()`
-    |
-127 |     await trio.sleep(delay=1)  # OK
-128 |
-129 |     await trio.sleep(seconds=86401)  # ASYNC116
-    |           ^^^^^^^^^^^^^^^^^^^^^^^^^ ASYNC116
-130 |     await trio.sleep(delay=86401)  # OK
-    |
-    = help: Replace with `trio.sleep_forever()`
-
-ℹ Unsafe fix
-126 126 |     await trio.sleep(seconds=1)  # OK
-127 127 |     await trio.sleep(delay=1)  # OK
-128 128 | 
-129     |-    await trio.sleep(seconds=86401)  # ASYNC116
-    129 |+    await trio.sleep_forever()  # ASYNC116
-130 130 |     await trio.sleep(delay=86401)  # OK
--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/explicit.rs
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/explicit.rs
@@ -1,12 +1,11 @@
-use ruff_diagnostics::AlwaysFixableViolation;
-use ruff_diagnostics::{Diagnostic, Edit, Fix};
+use ruff_diagnostics::{Diagnostic, Violation};
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_python_ast::{self as ast, Expr, Operator};
-use ruff_python_trivia::is_python_whitespace;
 use ruff_source_file::LineRanges;
-use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
+use ruff_text_size::Ranged;

-use crate::checkers::ast::Checker;
+use crate::Locator;
+use crate::settings::LinterSettings;

 /// ## What it does
 /// Checks for string literals that are explicitly concatenated (using the
@@ -35,76 +34,46 @@ use crate::checkers::ast::Checker;
 #[derive(ViolationMetadata)]
 pub(crate) struct ExplicitStringConcatenation;

-impl AlwaysFixableViolation for ExplicitStringConcatenation {
+impl Violation for ExplicitStringConcatenation {
    #[derive_message_formats]
    fn message(&self) -> String {
        "Explicitly concatenated string should be implicitly concatenated".to_string()
    }
-
-    fn fix_title(&self) -> String {
-        "Remove redundant '+' operator to implicitly concatenate".to_string()
-    }
 }

 /// ISC003
-pub(crate) fn explicit(expr: &Expr, checker: &Checker) -> Option<Diagnostic> {
+pub(crate) fn explicit(
+    expr: &Expr,
+    locator: &Locator,
+    settings: &LinterSettings,
+) -> Option<Diagnostic> {
    // If the user sets `allow-multiline` to `false`, then we should allow explicitly concatenated
    // strings that span multiple lines even if this rule is enabled. Otherwise, there's no way
    // for the user to write multiline strings, and that setting is "more explicit" than this rule
    // being enabled.
-    if !checker.settings.flake8_implicit_str_concat.allow_multiline {
+    if !settings.flake8_implicit_str_concat.allow_multiline {
        return None;
    }

-    if let Expr::BinOp(bin_op) = expr {
-        if let ast::ExprBinOp {
-            left,
-            right,
-            op: Operator::Add,
-            ..
-        } = bin_op
-        {
-            let concatable = matches!(
-                (left.as_ref(), right.as_ref()),
-                (
-                    Expr::StringLiteral(_) | Expr::FString(_),
-                    Expr::StringLiteral(_) | Expr::FString(_)
-                ) | (Expr::BytesLiteral(_), Expr::BytesLiteral(_))
-            );
-            if concatable
-                && checker
-                    .locator()
-                    .contains_line_break(TextRange::new(left.end(), right.start()))
+    if let Expr::BinOp(ast::ExprBinOp {
+        left,
+        op,
+        right,
+        range,
+    }) = expr
+    {
+        if matches!(op, Operator::Add) {
+            if matches!(
+                left.as_ref(),
+                Expr::FString(_) | Expr::StringLiteral(_) | Expr::BytesLiteral(_)
+            ) && matches!(
+                right.as_ref(),
+                Expr::FString(_) | Expr::StringLiteral(_) | Expr::BytesLiteral(_)
+            ) && locator.contains_line_break(*range)
            {
-                let mut diagnostic = Diagnostic::new(ExplicitStringConcatenation, expr.range());
-                diagnostic.set_fix(generate_fix(checker, bin_op));
-                return Some(diagnostic);
+                return Some(Diagnostic::new(ExplicitStringConcatenation, expr.range()));
            }
        }
    }
    None
 }
-
-fn generate_fix(checker: &Checker, expr_bin_op: &ast::ExprBinOp) -> Fix {
-    let ast::ExprBinOp { left, right, .. } = expr_bin_op;
-
-    let between_operands_range = TextRange::new(left.end(), right.start());
-    let between_operands = checker.locator().slice(between_operands_range);
-    let (before_plus, after_plus) = between_operands.split_once('+').unwrap();
-
-    let linebreak_before_operator =
-        before_plus.contains_line_break(TextRange::at(TextSize::new(0), before_plus.text_len()));
-
-    // If removing `+` from first line trim trailing spaces
-    // Preserve indentation when removing `+` from second line
-    let before_plus = if linebreak_before_operator {
-        before_plus
-    } else {
-        before_plus.trim_end_matches(is_python_whitespace)
-    };
-
-    Fix::safe_edit(Edit::range_replacement(
-        format!("{before_plus}{after_plus}"),
-        between_operands_range,
-    ))
-}
--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linterrulesflake8_implicit_str_concattestsISC001_ISC.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linterrulesflake8_implicit_str_concattestsISC001_ISC.py.snap
@@ -461,7 +461,6 @@ ISC.py:91:5: ISC001 [*] Implicitly concatenated string literals on one line
   91 |+_ = "\128" # fix should be "\128"
 92 92 | _ = "\12""foo" # fix should be "\12foo"
 93 93 | _ = "\12" ""  # fix should be "\12"
-94 94 | 

 ISC.py:92:5: ISC001 [*] Implicitly concatenated string literals on one line
   |
@@ -480,8 +479,6 @@ ISC.py:92:5: ISC001 [*] Implicitly concatenated string literals on one line
 92    |-_ = "\12""foo" # fix should be "\12foo"
   92 |+_ = "\12foo" # fix should be "\12foo"
 93 93 | _ = "\12" ""  # fix should be "\12"
-94 94 | 
-95 95 | 

 ISC.py:93:5: ISC001 [*] Implicitly concatenated string literals on one line
   |
@@ -498,6 +495,3 @@ ISC.py:93:5: ISC001 [*] Implicitly concatenated string literals on one line
 92 92 | _ = "\12""foo" # fix should be "\12foo"
 93    |-_ = "\12" ""  # fix should be "\12"
   93 |+_ = "\12"  # fix should be "\12"
-94 94 | 
-95 95 | 
-96 96 | # Mixed literal + non-literal scenarios
--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linterrulesflake8_implicit_str_concattestsISC003_ISC.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linterrulesflake8_implicit_str_concattestsISC003_ISC.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/flake8_implicit_str_concat/mod.rs
 ---
-ISC.py:9:3: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
+ISC.py:9:3: ISC003 Explicitly concatenated string should be implicitly concatenated
   |
 8 |   _ = (
 9 | /   "abc" +
@@ -9,19 +9,8 @@ ISC.py:9:3: ISC003 [*] Explicitly concatenated string should be implicitly conca
   | |_______^ ISC003
 11 |   )
   |
-   = help: Remove redundant '+' operator to implicitly concatenate

-ℹ Safe fix
-6  6  |     "def"
-7  7  | 
-8  8  | _ = (
-9     |-  "abc" +
-   9  |+  "abc"
-10 10 |   "def"
-11 11 | )
-12 12 | 
-
-ISC.py:14:3: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
+ISC.py:14:3: ISC003 Explicitly concatenated string should be implicitly concatenated
   |
 13 |   _ = (
 14 | /   f"abc" +
@@ -29,19 +18,8 @@ ISC.py:14:3: ISC003 [*] Explicitly concatenated string should be implicitly conc
   | |_______^ ISC003
 16 |   )
   |
-   = help: Remove redundant '+' operator to implicitly concatenate

-ℹ Safe fix
-11 11 | )
-12 12 | 
-13 13 | _ = (
-14    |-  f"abc" +
-   14 |+  f"abc"
-15 15 |   "def"
-16 16 | )
-17 17 | 
-
-ISC.py:19:3: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
+ISC.py:19:3: ISC003 Explicitly concatenated string should be implicitly concatenated
   |
 18 |   _ = (
 19 | /   b"abc" +
@@ -49,19 +27,8 @@ ISC.py:19:3: ISC003 [*] Explicitly concatenated string should be implicitly conc
   | |________^ ISC003
 21 |   )
   |
-   = help: Remove redundant '+' operator to implicitly concatenate

-ℹ Safe fix
-16 16 | )
-17 17 | 
-18 18 | _ = (
-19    |-  b"abc" +
-   19 |+  b"abc"
-20 20 |   b"def"
-21 21 | )
-22 22 | 
-
-ISC.py:78:10: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
+ISC.py:78:10: ISC003 Explicitly concatenated string should be implicitly concatenated
   |
 77 |   # Explicitly concatenated nested f-strings
 78 |   _ = f"a {f"first"
@@ -71,19 +38,8 @@ ISC.py:78:10: ISC003 [*] Explicitly concatenated string should be implicitly con
 80 |   _ = f"a {f"first {f"middle"}"
 81 |       + f"second"} d"
   |
-   = help: Remove redundant '+' operator to implicitly concatenate

-ℹ Safe fix
-76 76 | 
-77 77 | # Explicitly concatenated nested f-strings
-78 78 | _ = f"a {f"first"
-79    |-    + f"second"} d"
-   79 |+     f"second"} d"
-80 80 | _ = f"a {f"first {f"middle"}"
-81 81 |     + f"second"} d"
-82 82 | 
-
-ISC.py:80:10: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
+ISC.py:80:10: ISC003 Explicitly concatenated string should be implicitly concatenated
   |
 78 |   _ = f"a {f"first"
 79 |       + f"second"} d"
@@ -94,263 +50,3 @@ ISC.py:80:10: ISC003 [*] Explicitly concatenated string should be implicitly con
 82 |
 83 |   # See https://github.com/astral-sh/ruff/issues/12936
   |
-   = help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-78 78 | _ = f"a {f"first"
-79 79 |     + f"second"} d"
-80 80 | _ = f"a {f"first {f"middle"}"
-81    |-    + f"second"} d"
-   81 |+     f"second"} d"
-82 82 | 
-83 83 | # See https://github.com/astral-sh/ruff/issues/12936
-84 84 | _ = "\12""0" # fix should be "\0120"
-
-ISC.py:110:5: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
-    |
-109 |   _ = (
-110 | /     rf"raw_f{x}" +
-111 | |     r"raw_normal"
-    | |_________________^ ISC003
-112 |   )
-    |
-    = help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-107 107 | )
-108 108 | 
-109 109 | _ = (
-110     |-    rf"raw_f{x}" +
-    110 |+    rf"raw_f{x}"
-111 111 |     r"raw_normal"
-112 112 | )
-113 113 | 
-
-ISC.py:117:5: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
-    |
-115 |   # Different prefix combinations
-116 |   _ = (
-117 | /     u"unicode" +
-118 | |     r"raw"
-    | |__________^ ISC003
-119 |   )
-    |
-    = help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-114 114 | 
-115 115 | # Different prefix combinations
-116 116 | _ = (
-117     |-    u"unicode" +
-    117 |+    u"unicode"
-118 118 |     r"raw"
-119 119 | )
-120 120 | 
-
-ISC.py:122:5: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
-    |
-121 |   _ = (
-122 | /     rb"raw_bytes" +
-123 | |     b"normal_bytes"
-    | |___________________^ ISC003
-124 |   )
-    |
-    = help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-119 119 | )
-120 120 | 
-121 121 | _ = (
-122     |-    rb"raw_bytes" +
-    122 |+    rb"raw_bytes"
-123 123 |     b"normal_bytes"
-124 124 | )
-125 125 | 
-
-ISC.py:127:5: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
-    |
-126 |   _ = (
-127 | /     b"bytes" +
-128 | |     b"with_bytes"
-    | |_________________^ ISC003
-129 |   )
-    |
-    = help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-124 124 | )
-125 125 | 
-126 126 | _ = (
-127     |-    b"bytes" +
-    127 |+    b"bytes"
-128 128 |     b"with_bytes"
-129 129 | )
-130 130 | 
-
-ISC.py:133:6: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
-    |
-131 |   # Repeated concatenation
-132 |
-133 |   _ = ("a" +
-    |  ______^
-134 | |     "b" +
-    | |_______^ ISC003
-135 |       "c" +
-136 |       "d" + "e"
-    |
-    = help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-130 130 | 
-131 131 | # Repeated concatenation
-132 132 | 
-133     |-_ = ("a" +
-    133 |+_ = ("a"
-134 134 |     "b" +
-135 135 |     "c" +
-136 136 |     "d" + "e"
-
-ISC.py:139:6: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
-    |
-137 |   )
-138 |
-139 |   _ = ("a"
-    |  ______^
-140 | |     + "b"
-    | |_________^ ISC003
-141 |       + "c"
-142 |       + "d"
-    |
-    = help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-137 137 | )
-138 138 | 
-139 139 | _ = ("a"
-140     |-    + "b"
-    140 |+     "b"
-141 141 |     + "c"
-142 142 |     + "d"
-143 143 |     + "e"
-
-ISC.py:160:5: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
-    |
-159 |   _ = (
-160 | /     "first"
-161 | |     +    "second"  # extra spaces around +
-    | |_________________^ ISC003
-162 |   )
-    |
-    = help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-158 158 | 
-159 159 | _ = (
-160 160 |     "first"
-161     |-    +    "second"  # extra spaces around +
-    161 |+        "second"  # extra spaces around +
-162 162 | )
-163 163 | 
-164 164 | _ = (
-
-ISC.py:165:5: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
-    |
-164 |   _ = (
-165 | /     "first"    +  # trailing spaces before +
-166 | |     "second"
-    | |____________^ ISC003
-167 |   )
-    |
-    = help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-162 162 | )
-163 163 | 
-164 164 | _ = (
-165     |-    "first"    +  # trailing spaces before +
-    165 |+    "first"  # trailing spaces before +
-166 166 |     "second"
-167 167 | )
-168 168 | 
-
-ISC.py:170:5: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
-    |
-169 |   _ = ((
-170 | /     "deep" +
-171 | |     "nesting"
-    | |_____________^ ISC003
-172 |   ))
-    |
-    = help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-167 167 | )
-168 168 | 
-169 169 | _ = ((
-170     |-    "deep" +
-    170 |+    "deep"
-171 171 |     "nesting"
-172 172 | ))
-173 173 | 
-
-ISC.py:175:5: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
-    |
-174 |   _ = (
-175 | /     "contains + plus" +
-176 | |     "another string"
-    | |____________________^ ISC003
-177 |   )
-    |
-    = help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-172 172 | ))
-173 173 | 
-174 174 | _ = (
-175     |-    "contains + plus" +
-    175 |+    "contains + plus"
-176 176 |     "another string"
-177 177 | )
-178 178 | 
-
-ISC.py:180:5: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
-    |
-179 |   _ = (
-180 | /     "start"
-181 | |         # leading comment
-182 | |     + "end"
-    | |___________^ ISC003
-183 |   )
-    |
-    = help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-179 179 | _ = (
-180 180 |     "start"
-181 181 | 		# leading comment
-182     |-    + "end"
-    182 |+     "end"
-183 183 | )
-184 184 | 
-185 185 | _ = (
-
-ISC.py:186:5: ISC003 [*] Explicitly concatenated string should be implicitly concatenated
-    |
-185 |   _ = (
-186 | /     "start" +
-187 | |         # leading comment
-188 | |     "end"
-    | |_________^ ISC003
-189 |   )
-    |
-    = help: Remove redundant '+' operator to implicitly concatenate
-
-ℹ Safe fix
-183 183 | )
-184 184 | 
-185 185 | _ = (
-186     |-    "start" +
-    186 |+    "start"
-187 187 | 		# leading comment
-188 188 |     "end"
-189 189 | )
--- a/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linterrulesflake8_implicit_str_concattestsmultiline_ISC001_ISC.py.snap
+++ b/crates/ruff_linter/src/rules/flake8_implicit_str_concat/snapshots/ruff_linterrulesflake8_implicit_str_concattestsmultiline_ISC001_ISC.py.snap
@@ -461,7 +461,6 @@ ISC.py:91:5: ISC001 [*] Implicitly concatenated string literals on one line
   91 |+_ = "\128" # fix should be "\128"
 92 92 | _ = "\12""foo" # fix should be "\12foo"
 93 93 | _ = "\12" ""  # fix should be "\12"
-94 94 | 

 ISC.py:92:5: ISC001 [*] Implicitly concatenated string literals on one line
   |
@@ -480,8 +479,6 @@ ISC.py:92:5: ISC001 [*] Implicitly concatenated string literals on one line
 92    |-_ = "\12""foo" # fix should be "\12foo"
   92 |+_ = "\12foo" # fix should be "\12foo"
 93 93 | _ = "\12" ""  # fix should be "\12"
-94 94 | 
-95 95 | 

 ISC.py:93:5: ISC001 [*] Implicitly concatenated string literals on one line
   |
@@ -498,6 +495,3 @@ ISC.py:93:5: ISC001 [*] Implicitly concatenated string literals on one line
 92 92 | _ = "\12""foo" # fix should be "\12foo"
 93    |-_ = "\12" ""  # fix should be "\12"
   93 |+_ = "\12"  # fix should be "\12"
-94 94 | 
-95 95 | 
-96 96 | # Mixed literal + non-literal scenarios
--- a/crates/ruff_linter/src/rules/pycodestyle/rules/literal_comparisons.rs
+++ b/crates/ruff_linter/src/rules/pycodestyle/rules/literal_comparisons.rs
@@ -136,18 +136,22 @@ impl AlwaysFixableViolation for TrueFalseComparison {
        let cond = cond.truncated_display();
        match (value, op) {
            (true, EqCmpOp::Eq) => {
-                format!("Avoid equality comparisons to `True`; use `{cond}:` for truth checks")
+                format!("Avoid equality comparisons to `True`; use `if {cond}:` for truth checks")
            }
            (true, EqCmpOp::NotEq) => {
                format!(
-                    "Avoid inequality comparisons to `True`; use `not {cond}:` for false checks"
+                    "Avoid inequality comparisons to `True`; use `if not {cond}:` for false checks"
                )
            }
            (false, EqCmpOp::Eq) => {
-                format!("Avoid equality comparisons to `False`; use `not {cond}:` for false checks")
+                format!(
+                    "Avoid equality comparisons to `False`; use `if not {cond}:` for false checks"
+                )
            }
            (false, EqCmpOp::NotEq) => {
-                format!("Avoid inequality comparisons to `False`; use `{cond}:` for truth checks")
+                format!(
+                    "Avoid inequality comparisons to `False`; use `if {cond}:` for truth checks"
+                )
            }
        }
    }
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsE712_E712.py.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsE712_E712.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff_linter/src/rules/pycodestyle/mod.rs
 ---
-E712.py:2:4: E712 [*] Avoid equality comparisons to `True`; use `res:` for truth checks
+E712.py:2:4: E712 [*] Avoid equality comparisons to `True`; use `if res:` for truth checks
  |
 1 | #: E712
 2 | if res == True:
@@ -19,7 +19,7 @@ E712.py:2:4: E712 [*] Avoid equality comparisons to `True`; use `res:` for truth
 4 4 | #: E712
 5 5 | if res != False:

-E712.py:5:4: E712 [*] Avoid inequality comparisons to `False`; use `res:` for truth checks
+E712.py:5:4: E712 [*] Avoid inequality comparisons to `False`; use `if res:` for truth checks
  |
 3 |     pass
 4 | #: E712
@@ -40,7 +40,7 @@ E712.py:5:4: E712 [*] Avoid inequality comparisons to `False`; use `res:` for tr
 7 7 | #: E712
 8 8 | if True != res:

-E712.py:8:4: E712 [*] Avoid inequality comparisons to `True`; use `not res:` for false checks
+E712.py:8:4: E712 [*] Avoid inequality comparisons to `True`; use `if not res:` for false checks
   |
 6 |     pass
 7 | #: E712
@@ -61,7 +61,7 @@ E712.py:8:4: E712 [*] Avoid inequality comparisons to `True`; use `not res:` for
 10 10 | #: E712
 11 11 | if False == res:

-E712.py:11:4: E712 [*] Avoid equality comparisons to `False`; use `not res:` for false checks
+E712.py:11:4: E712 [*] Avoid equality comparisons to `False`; use `if not res:` for false checks
   |
 9 |     pass
 10 | #: E712
@@ -82,7 +82,7 @@ E712.py:11:4: E712 [*] Avoid equality comparisons to `False`; use `not res:` for
 13 13 | #: E712
 14 14 | if res[1] == True:

-E712.py:14:4: E712 [*] Avoid equality comparisons to `True`; use `res[1]:` for truth checks
+E712.py:14:4: E712 [*] Avoid equality comparisons to `True`; use `if res[1]:` for truth checks
   |
 12 |     pass
 13 | #: E712
@@ -103,7 +103,7 @@ E712.py:14:4: E712 [*] Avoid equality comparisons to `True`; use `res[1]:` for t
 16 16 | #: E712
 17 17 | if res[1] != False:

-E712.py:17:4: E712 [*] Avoid inequality comparisons to `False`; use `res[1]:` for truth checks
+E712.py:17:4: E712 [*] Avoid inequality comparisons to `False`; use `if res[1]:` for truth checks
   |
 15 |     pass
 16 | #: E712
@@ -124,7 +124,7 @@ E712.py:17:4: E712 [*] Avoid inequality comparisons to `False`; use `res[1]:` fo
 19 19 | #: E712
 20 20 | var = 1 if cond == True else -1 if cond == False else cond

-E712.py:20:12: E712 [*] Avoid equality comparisons to `True`; use `cond:` for truth checks
+E712.py:20:12: E712 [*] Avoid equality comparisons to `True`; use `if cond:` for truth checks
   |
 18 |     pass
 19 | #: E712
@@ -145,7 +145,7 @@ E712.py:20:12: E712 [*] Avoid equality comparisons to `True`; use `cond:` for tr
 22 22 | if (True) == TrueElement or x == TrueElement:
 23 23 |     pass

-E712.py:20:36: E712 [*] Avoid equality comparisons to `False`; use `not cond:` for false checks
+E712.py:20:36: E712 [*] Avoid equality comparisons to `False`; use `if not cond:` for false checks
   |
 18 |     pass
 19 | #: E712
@@ -166,7 +166,7 @@ E712.py:20:36: E712 [*] Avoid equality comparisons to `False`; use `not cond:` f
 22 22 | if (True) == TrueElement or x == TrueElement:
 23 23 |     pass

-E712.py:22:4: E712 [*] Avoid equality comparisons to `True`; use `TrueElement:` for truth checks
+E712.py:22:4: E712 [*] Avoid equality comparisons to `True`; use `if TrueElement:` for truth checks
   |
 20 | var = 1 if cond == True else -1 if cond == False else cond
 21 | #: E712
@@ -226,7 +226,7 @@ E712.py:25:4: E712 [*] Avoid equality comparisons to `True` or `False`
 27 27 | 
 28 28 | if(True) == TrueElement or x == TrueElement:

-E712.py:28:3: E712 [*] Avoid equality comparisons to `True`; use `TrueElement:` for truth checks
+E712.py:28:3: E712 [*] Avoid equality comparisons to `True`; use `if TrueElement:` for truth checks
   |
 26 |     pass
 27 |
@@ -246,7 +246,7 @@ E712.py:28:3: E712 [*] Avoid equality comparisons to `True`; use `TrueElement:`
 30 30 | 
 31 31 | if (yield i) == True:

-E712.py:31:4: E712 [*] Avoid equality comparisons to `True`; use `yield i:` for truth checks
+E712.py:31:4: E712 [*] Avoid equality comparisons to `True`; use `if yield i:` for truth checks
   |
 29 |     pass
 30 |
@@ -266,7 +266,7 @@ E712.py:31:4: E712 [*] Avoid equality comparisons to `True`; use `yield i:` for
 33 33 | 
 34 34 | #: Okay

-E712.py:58:4: E712 [*] Avoid equality comparisons to `True`; use `True:` for truth checks
+E712.py:58:4: E712 [*] Avoid equality comparisons to `True`; use `if True:` for truth checks
   |
 57 | # https://github.com/astral-sh/ruff/issues/17582
 58 | if True == True: # No duplicated diagnostic
--- a/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsconstant_literals.snap
+++ b/crates/ruff_linter/src/rules/pycodestyle/snapshots/ruff_linterrulespycodestyletestsconstant_literals.snap
@@ -106,7 +106,7 @@ constant_literals.py:12:4: F632 [*] Use `==` to compare constant literals
 14 14 | if False == None:  # E711, E712 (fix)
 15 15 |     pass

-constant_literals.py:14:4: E712 [*] Avoid equality comparisons to `False`; use `not None:` for false checks
+constant_literals.py:14:4: E712 [*] Avoid equality comparisons to `False`; use `if not None:` for false checks
   |
 12 | if False is "abc":  # F632 (fix, but leaves behind unfixable E712)
 13 |     pass
@@ -168,7 +168,7 @@ constant_literals.py:16:4: E711 [*] Comparison to `None` should be `cond is None
 18 18 | 
 19 19 | named_var = []

-constant_literals.py:16:4: E712 [*] Avoid equality comparisons to `False`; use `not None:` for false checks
+constant_literals.py:16:4: E712 [*] Avoid equality comparisons to `False`; use `if not None:` for false checks
   |
 14 | if False == None:  # E711, E712 (fix)
 15 |     pass
--- a/crates/ruff_linter/src/rules/pyupgrade/mod.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/mod.rs
@@ -111,7 +111,6 @@ mod tests {
    #[test_case(Rule::NonPEP695GenericFunction, Path::new("UP047.py"))]
    #[test_case(Rule::PrivateTypeParameter, Path::new("UP049_0.py"))]
    #[test_case(Rule::PrivateTypeParameter, Path::new("UP049_1.py"))]
-    #[test_case(Rule::UselessClassMetaclassType, Path::new("UP050.py"))]
    fn rules(rule_code: Rule, path: &Path) -> Result<()> {
        let snapshot = path.to_string_lossy().to_string();
        let diagnostics = test_path(
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/mod.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/mod.rs
@@ -37,7 +37,6 @@ pub(crate) use unpacked_list_comprehension::*;
 pub(crate) use use_pep585_annotation::*;
 pub(crate) use use_pep604_annotation::*;
 pub(crate) use use_pep604_isinstance::*;
-pub(crate) use useless_class_metaclass_type::*;
 pub(crate) use useless_metaclass_type::*;
 pub(crate) use useless_object_inheritance::*;
 pub(crate) use yield_in_for_loop::*;
@@ -81,7 +80,6 @@ mod unpacked_list_comprehension;
 mod use_pep585_annotation;
 mod use_pep604_annotation;
 mod use_pep604_isinstance;
-mod useless_class_metaclass_type;
 mod useless_metaclass_type;
 mod useless_object_inheritance;
 mod yield_in_for_loop;
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_future_import.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/unnecessary_future_import.rs
@@ -1,7 +1,7 @@
 use itertools::Itertools;
 use ruff_python_ast::{Alias, Stmt};

-use ruff_diagnostics::{AlwaysFixableViolation, Applicability, Diagnostic, Fix};
+use ruff_diagnostics::{AlwaysFixableViolation, Diagnostic, Fix};
 use ruff_macros::{ViolationMetadata, derive_message_formats};
 use ruff_text_size::Ranged;

@@ -123,19 +123,9 @@ pub(crate) fn unnecessary_future_import(checker: &Checker, stmt: &Stmt, names: &
            checker.stylist(),
            checker.indexer(),
        )?;
-
-        let range = edit.range();
-        let applicability = if checker.comment_ranges().intersects(range) {
-            Applicability::Unsafe
-        } else {
-            Applicability::Safe
-        };
-
-        Ok(
-            Fix::applicable_edit(edit, applicability).isolate(Checker::isolation(
-                checker.semantic().current_statement_parent_id(),
-            )),
-        )
+        Ok(Fix::safe_edit(edit).isolate(Checker::isolation(
+            checker.semantic().current_statement_parent_id(),
+        )))
    });
    checker.report_diagnostic(diagnostic);
 }
--- a/crates/ruff_linter/src/rules/pyupgrade/rules/useless_class_metaclass_type.rs
+++ b/crates/ruff_linter/src/rules/pyupgrade/rules/useless_class_metaclass_type.rs
@@ -1,79 +0,0 @@
-use crate::checkers::ast::Checker;
-use crate::fix::edits::{Parentheses, remove_argument};
-use ruff_diagnostics::{Diagnostic, Fix, FixAvailability, Violation};
-use ruff_macros::{ViolationMetadata, derive_message_formats};
-use ruff_python_ast::StmtClassDef;
-use ruff_text_size::Ranged;
-
-/// ## What it does
-/// Checks for `metaclass=type` in class definitions.
-///
-/// ## Why is this bad?
-/// Since Python 3, the default metaclass is `type`, so specifying it explicitly is redundant.
-///
-/// Even though `__prepare__` is not required, the default metaclass (`type`) implements it,
-/// for the convenience of subclasses calling it via `super()`.
-/// ## Example
-///
-/// ```python
-/// class Foo(metaclass=type): ...
-/// ```
-///
-/// Use instead:
-///
-/// ```python
-/// class Foo: ...
-/// ```
-///
-/// ## References
-/// - [PEP 3115 – Metaclasses in Python 3000](https://peps.python.org/pep-3115/)
-#[derive(ViolationMetadata)]
-pub(crate) struct UselessClassMetaclassType {
-    name: String,
-}
-
-impl Violation for UselessClassMetaclassType {
-    const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
-
-    #[derive_message_formats]
-    fn message(&self) -> String {
-        let UselessClassMetaclassType { name } = self;
-        format!("Class `{name}` uses `metaclass=type`, which is redundant")
-    }
-
-    fn fix_title(&self) -> Option<String> {
-        Some("Remove `metaclass=type`".to_string())
-    }
-}
-
-/// UP050
-pub(crate) fn useless_class_metaclass_type(checker: &Checker, class_def: &StmtClassDef) {
-    let Some(arguments) = class_def.arguments.as_deref() else {
-        return;
-    };
-
-    for keyword in &arguments.keywords {
-        if let (Some("metaclass"), expr) = (keyword.arg.as_deref(), &keyword.value) {
-            if checker.semantic().match_builtin_expr(expr, "type") {
-                let mut diagnostic = Diagnostic::new(
-                    UselessClassMetaclassType {
-                        name: class_def.name.to_string(),
-                    },
-                    keyword.range(),
-                );
-
-                diagnostic.try_set_fix(|| {
-                    remove_argument(
-                        keyword,
-                        arguments,
-                        Parentheses::Remove,
-                        checker.locator().contents(),
-                    )
-                    .map(Fix::safe_edit)
-                });
-
-                checker.report_diagnostic(diagnostic);
-            }
-        }
-    }
-}
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linterrulespyupgradetestsUP010.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linterrulespyupgradetestsUP010.py.snap
@@ -156,7 +156,6 @@ UP010.py:13:5: UP010 [*] Unnecessary `__future__` import `generator_stop` for ta
 13 |     from __future__ import generator_stop
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ UP010
 14 |     from __future__ import invalid_module, generators
-15 |     from __future__ import generators  # comment
   |
   = help: Remove unnecessary `__future__` import

@@ -166,7 +165,6 @@ UP010.py:13:5: UP010 [*] Unnecessary `__future__` import `generator_stop` for ta
 12 12 | if True:
 13    |-    from __future__ import generator_stop
 14 13 |     from __future__ import invalid_module, generators
-15 14 |     from __future__ import generators  # comment

 UP010.py:14:5: UP010 [*] Unnecessary `__future__` import `generators` for target Python version
   |
@@ -174,7 +172,6 @@ UP010.py:14:5: UP010 [*] Unnecessary `__future__` import `generators` for target
 13 |     from __future__ import generator_stop
 14 |     from __future__ import invalid_module, generators
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ UP010
-15 |     from __future__ import generators  # comment
   |
   = help: Remove unnecessary `__future__` import

@@ -184,19 +181,3 @@ UP010.py:14:5: UP010 [*] Unnecessary `__future__` import `generators` for target
 13 13 |     from __future__ import generator_stop
 14    |-    from __future__ import invalid_module, generators
   14 |+    from __future__ import invalid_module
-15 15 |     from __future__ import generators  # comment
-
-UP010.py:15:5: UP010 [*] Unnecessary `__future__` import `generators` for target Python version
-   |
-13 |     from __future__ import generator_stop
-14 |     from __future__ import invalid_module, generators
-15 |     from __future__ import generators  # comment
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ UP010
-   |
-   = help: Remove unnecessary `__future__` import
-
-ℹ Unsafe fix
-12 12 | if True:
-13 13 |     from __future__ import generator_stop
-14 14 |     from __future__ import invalid_module, generators
-15    |-    from __future__ import generators  # comment
--- a/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linterrulespyupgradetestsUP050.py.snap
+++ b/crates/ruff_linter/src/rules/pyupgrade/snapshots/ruff_linterrulespyupgradetestsUP050.py.snap
@@ -1,237 +0,0 @@
---
-source: crates/ruff_linter/src/rules/pyupgrade/mod.rs
---
-UP050.py:5:9: UP050 [*] Class `A` uses `metaclass=type`, which is redundant
-  |
-5 | class A(metaclass=type):
-  |         ^^^^^^^^^^^^^^ UP050
-6 |     ...
-  |
-  = help: Remove `metaclass=type`
-
-ℹ Safe fix
-2 2 |     ...
-3 3 | 
-4 4 | 
-5   |-class A(metaclass=type):
-  5 |+class A:
-6 6 |     ...
-7 7 | 
-8 8 | 
-
-UP050.py:10:5: UP050 [*] Class `A` uses `metaclass=type`, which is redundant
-   |
- 9 | class A(
-10 |     metaclass=type
-   |     ^^^^^^^^^^^^^^ UP050
-11 | ):
-12 |     ...
-   |
-   = help: Remove `metaclass=type`
-
-ℹ Safe fix
-6  6  |     ...
-7  7  | 
-8  8  | 
-9     |-class A(
-10    |-    metaclass=type
-11    |-):
-   9  |+class A:
-12 10 |     ...
-13 11 | 
-14 12 | 
-
-UP050.py:16:5: UP050 [*] Class `A` uses `metaclass=type`, which is redundant
-   |
-15 | class A(
-16 |     metaclass=type
-   |     ^^^^^^^^^^^^^^ UP050
-17 |     #
-18 | ):
-   |
-   = help: Remove `metaclass=type`
-
-ℹ Safe fix
-12 12 |     ...
-13 13 | 
-14 14 | 
-15    |-class A(
-16    |-    metaclass=type
-17    |-    #
-18    |-):
-   15 |+class A:
-19 16 |     ...
-20 17 | 
-21 18 | 
-
-UP050.py:24:5: UP050 [*] Class `A` uses `metaclass=type`, which is redundant
-   |
-22 | class A(
-23 |     #
-24 |     metaclass=type
-   |     ^^^^^^^^^^^^^^ UP050
-25 | ):
-26 |     ...
-   |
-   = help: Remove `metaclass=type`
-
-ℹ Safe fix
-19 19 |     ...
-20 20 | 
-21 21 | 
-22    |-class A(
-23    |-    #
-24    |-    metaclass=type
-25    |-):
-   22 |+class A:
-26 23 |     ...
-27 24 | 
-28 25 | 
-
-UP050.py:30:5: UP050 [*] Class `A` uses `metaclass=type`, which is redundant
-   |
-29 | class A(
-30 |     metaclass=type,
-   |     ^^^^^^^^^^^^^^ UP050
-31 |     #
-32 | ):
-   |
-   = help: Remove `metaclass=type`
-
-ℹ Safe fix
-26 26 |     ...
-27 27 | 
-28 28 | 
-29    |-class A(
-30    |-    metaclass=type,
-31    |-    #
-32    |-):
-   29 |+class A:
-33 30 |     ...
-34 31 | 
-35 32 | 
-
-UP050.py:38:5: UP050 [*] Class `A` uses `metaclass=type`, which is redundant
-   |
-36 | class A(
-37 |     #
-38 |     metaclass=type,
-   |     ^^^^^^^^^^^^^^ UP050
-39 |     #
-40 | ):
-   |
-   = help: Remove `metaclass=type`
-
-ℹ Safe fix
-33 33 |     ...
-34 34 | 
-35 35 | 
-36    |-class A(
-37    |-    #
-38    |-    metaclass=type,
-39    |-    #
-40    |-):
-   36 |+class A:
-41 37 |     ...
-42 38 | 
-43 39 | 
-
-UP050.py:44:12: UP050 [*] Class `B` uses `metaclass=type`, which is redundant
-   |
-44 | class B(A, metaclass=type):
-   |            ^^^^^^^^^^^^^^ UP050
-45 |     ...
-   |
-   = help: Remove `metaclass=type`
-
-ℹ Safe fix
-41 41 |     ...
-42 42 | 
-43 43 | 
-44    |-class B(A, metaclass=type):
-   44 |+class B(A):
-45 45 |     ...
-46 46 | 
-47 47 | 
-
-UP050.py:50:5: UP050 [*] Class `B` uses `metaclass=type`, which is redundant
-   |
-48 | class B(
-49 |     A,
-50 |     metaclass=type,
-   |     ^^^^^^^^^^^^^^ UP050
-51 | ):
-52 |     ...
-   |
-   = help: Remove `metaclass=type`
-
-ℹ Safe fix
-47 47 | 
-48 48 | class B(
-49 49 |     A,
-50    |-    metaclass=type,
-51 50 | ):
-52 51 |     ...
-53 52 | 
-
-UP050.py:58:5: UP050 [*] Class `B` uses `metaclass=type`, which is redundant
-   |
-56 |     A,
-57 |     # comment
-58 |     metaclass=type,
-   |     ^^^^^^^^^^^^^^ UP050
-59 | ):
-60 |     ...
-   |
-   = help: Remove `metaclass=type`
-
-ℹ Safe fix
-54 54 | 
-55 55 | class B(
-56 56 |     A,
-57    |-    # comment
-58    |-    metaclass=type,
-59 57 | ):
-60 58 |     ...
-61 59 | 
-
-UP050.py:69:5: UP050 [*] Class `A` uses `metaclass=type`, which is redundant
-   |
-68 | class A(
-69 |     metaclass=type  # comment
-   |     ^^^^^^^^^^^^^^ UP050
-70 |     ,
-71 | ):
-   |
-   = help: Remove `metaclass=type`
-
-ℹ Safe fix
-65 65 |         ...
-66 66 | 
-67 67 | 
-68    |-class A(
-69    |-    metaclass=type  # comment
-70    |-    ,
-71    |-):
-   68 |+class A:
-72 69 |     ...
-73 70 | 
-74 71 | 
-
-UP050.py:83:9: UP050 [*] Class `A` uses `metaclass=type`, which is redundant
-   |
-81 | import builtins
-82 |
-83 | class A(metaclass=builtins.type):
-   |         ^^^^^^^^^^^^^^^^^^^^^^^ UP050
-84 |     ...
-   |
-   = help: Remove `metaclass=type`
-
-ℹ Safe fix
-80 80 | 
-81 81 | import builtins
-82 82 | 
-83    |-class A(metaclass=builtins.type):
-   83 |+class A:
-84 84 |     ...
--- a/crates/ruff_wasm/Cargo.toml
+++ b/crates/ruff_wasm/Cargo.toml
@@ -41,8 +41,6 @@ getrandom = { workspace = true, features = ["wasm_js"] }
 serde = { workspace = true }
 serde-wasm-bindgen = { workspace = true }
 wasm-bindgen = { workspace = true }
-# Not a direct dependency but required to compile for Wasm.
-uuid = { workspace = true, features = ["js"] }

 [dev-dependencies]
 wasm-bindgen-test = { workspace = true }
--- a/crates/ty/Cargo.toml
+++ b/crates/ty/Cargo.toml
@@ -22,7 +22,7 @@ ty_server = { workspace = true }

 anyhow = { workspace = true }
 argfile = { workspace = true }
-clap = { workspace = true, features = ["wrap_help", "string", "env"] }
+clap = { workspace = true, features = ["wrap_help", "string"] }
 clap_complete_command = { workspace = true }
 colored = { workspace = true }
 countme = { workspace = true, features = ["enable"] }
--- a/crates/ty/docs/cli.md
+++ b/crates/ty/docs/cli.md
@@ -43,13 +43,8 @@ ty check [OPTIONS] [PATH]...
 <li><code>auto</code>:  Display colors if the output goes to an interactive terminal</li>
 <li><code>always</code>:  Always display colors</li>
 <li><code>never</code>:  Never display colors</li>
-</ul></dd><dt id="ty-check--config"><a href="#ty-check--config"><code>--config</code></a>, <code>-c</code> <i>config-option</i></dt><dd><p>A TOML <code>&lt;KEY&gt; = &lt;VALUE&gt;</code> pair (such as you might find in a <code>ty.toml</code> configuration file)
-overriding a specific configuration option.</p>
-<p>Overrides of individual settings using this option always take precedence
-over all configuration files.</p>
-</dd><dt id="ty-check--config-file"><a href="#ty-check--config-file"><code>--config-file</code></a> <i>path</i></dt><dd><p>The path to a <code>ty.toml</code> file to use for configuration.</p>
-<p>While ty configuration can be included in a <code>pyproject.toml</code> file, it is not allowed in this context.</p>
-<p>May also be set with the <code>TY_CONFIG_FILE</code> environment variable.</p></dd><dt id="ty-check--error"><a href="#ty-check--error"><code>--error</code></a> <i>rule</i></dt><dd><p>Treat the given rule as having severity 'error'. Can be specified multiple times.</p>
+</ul></dd><dt id="ty-check--config"><a href="#ty-check--config"><code>--config</code></a>, <code>-c</code> <i>config-option</i></dt><dd><p>A TOML <code>&lt;KEY&gt; = &lt;VALUE&gt;</code> pair</p>
+</dd><dt id="ty-check--error"><a href="#ty-check--error"><code>--error</code></a> <i>rule</i></dt><dd><p>Treat the given rule as having severity 'error'. Can be specified multiple times.</p>
 </dd><dt id="ty-check--error-on-warning"><a href="#ty-check--error-on-warning"><code>--error-on-warning</code></a></dt><dd><p>Use exit code 1 if there are any warning-level diagnostics</p>
 </dd><dt id="ty-check--exit-zero"><a href="#ty-check--exit-zero"><code>--exit-zero</code></a></dt><dd><p>Always use exit code 0, even when there are error-level diagnostics</p>
 </dd><dt id="ty-check--extra-search-path"><a href="#ty-check--extra-search-path"><code>--extra-search-path</code></a> <i>path</i></dt><dd><p>Additional path to use as a module-resolution source (can be passed multiple times)</p>
--- a/crates/ty/docs/configuration.md
+++ b/crates/ty/docs/configuration.md
@@ -1,6 +1,25 @@
 <!-- WARNING: This file is auto-generated (cargo dev generate-all). Update the doc comments on the 'Options' struct in 'crates/ty_project/src/metadata/options.rs' if you want to change anything here. -->

 # Configuration
+#### `respect-ignore-files`
+
+Whether to automatically exclude files that are ignored by `.ignore`,
+`.gitignore`, `.git/info/exclude`, and global `gitignore` files.
+Enabled by default.
+
+**Default value**: `true`
+
+**Type**: `bool`
+
+**Example usage** (`pyproject.toml`):
+
+```toml
+[tool.ty]
+respect-ignore-files = false
+```
+
+---
+
 #### `rules`

 Configures the enabled rules and their severity.
@@ -143,25 +162,6 @@ typeshed = "/path/to/custom/typeshed"

 ## `src`

-#### `respect-ignore-files`
-
-Whether to automatically exclude files that are ignored by `.ignore`,
-`.gitignore`, `.git/info/exclude`, and global `gitignore` files.
-Enabled by default.
-
-**Default value**: `true`
-
-**Type**: `bool`
-
-**Example usage** (`pyproject.toml`):
-
-```toml
-[tool.ty.src]
-respect-ignore-files = false
-```
-
---
-
 #### `root`

 The root of the project, used for finding first-party modules.
@@ -172,9 +172,6 @@ If left unspecified, ty will try to detect common project layouts and initialize
 * if a `./<project-name>/<project-name>` directory exists, include `.` and `./<project-name>` in the first party search path
 * otherwise, default to `.` (flat layout)

-Besides, if a `./tests` directory exists and is not a package (i.e. it does not contain an `__init__.py` file),
-it will also be included in the first party search path.
-
 **Default value**: `null`

 **Type**: `str`
--- a/crates/ty/docs/rules.md
+++ b/crates/ty/docs/rules.md
@@ -52,7 +52,7 @@ Calling a non-callable object will raise a `TypeError` at runtime.

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20call-non-callable)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L93)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L91)
 </details>

 ## `conflicting-argument-forms`
@@ -83,7 +83,7 @@ f(int)  # error

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-argument-forms)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L137)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L135)
 </details>

 ## `conflicting-declarations`
@@ -113,7 +113,7 @@ a = 1

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-declarations)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L163)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L161)
 </details>

 ## `conflicting-metaclass`
@@ -144,7 +144,7 @@ class C(A, B): ...

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-metaclass)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L188)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L186)
 </details>

 ## `cyclic-class-definition`
@@ -175,7 +175,7 @@ class B(A): ...

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20cyclic-class-definition)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L214)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L212)
 </details>

 ## `duplicate-base`
@@ -201,7 +201,7 @@ class B(A, A): ...

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20duplicate-base)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L258)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L256)
 </details>

 ## `escape-character-in-forward-annotation`
@@ -338,7 +338,7 @@ TypeError: multiple bases have instance lay-out conflict

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20incompatible-slots)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L279)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L277)
 </details>

 ## `inconsistent-mro`
@@ -367,7 +367,7 @@ class C(A, B): ...

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20inconsistent-mro)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L365)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L363)
 </details>

 ## `index-out-of-bounds`
@@ -392,7 +392,7 @@ t[3]  # IndexError: tuple index out of range

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20index-out-of-bounds)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L389)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L387)
 </details>

 ## `invalid-argument-type`
@@ -418,7 +418,7 @@ func("foo")  # error: [invalid-argument-type]

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-argument-type)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L409)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L407)
 </details>

 ## `invalid-assignment`
@@ -445,7 +445,7 @@ a: int = ''

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-assignment)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L449)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L447)
 </details>

 ## `invalid-attribute-access`
@@ -478,7 +478,7 @@ C.instance_var = 3  # error: Cannot assign to instance variable

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-attribute-access)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1397)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1395)
 </details>

 ## `invalid-base`
@@ -501,7 +501,7 @@ class A(42): ...  # error: [invalid-base]

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-base)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L471)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L469)
 </details>

 ## `invalid-context-manager`
@@ -527,7 +527,7 @@ with 1:

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-context-manager)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L522)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L520)
 </details>

 ## `invalid-declaration`
@@ -555,7 +555,7 @@ a: str

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-declaration)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L543)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L541)
 </details>

 ## `invalid-exception-caught`
@@ -596,7 +596,7 @@ except ZeroDivisionError:

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-exception-caught)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L566)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L564)
 </details>

 ## `invalid-generic-class`
@@ -627,7 +627,7 @@ class C[U](Generic[T]): ...

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-generic-class)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L602)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L600)
 </details>

 ## `invalid-legacy-type-variable`
@@ -660,7 +660,7 @@ def f(t: TypeVar("U")): ...

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-legacy-type-variable)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L628)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L626)
 </details>

 ## `invalid-metaclass`
@@ -692,7 +692,7 @@ class B(metaclass=f): ...

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-metaclass)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L677)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L675)
 </details>

 ## `invalid-overload`
@@ -740,7 +740,7 @@ def foo(x: int) -> int: ...

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-overload)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L704)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L702)
 </details>

 ## `invalid-parameter-default`
@@ -765,7 +765,7 @@ def f(a: int = ''): ...

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-parameter-default)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L747)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L745)
 </details>

 ## `invalid-protocol`
@@ -798,7 +798,7 @@ TypeError: Protocols can only inherit from other protocols, got <class 'int'>

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-protocol)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L337)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L335)
 </details>

 ## `invalid-raise`
@@ -846,7 +846,7 @@ def g():

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-raise)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L767)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L765)
 </details>

 ## `invalid-return-type`
@@ -870,7 +870,7 @@ def func() -> int:

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-return-type)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L430)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L428)
 </details>

 ## `invalid-super-argument`
@@ -914,7 +914,7 @@ super(B, A)  # error: `A` does not satisfy `issubclass(A, B)`

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-super-argument)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L810)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L808)
 </details>

 ## `invalid-syntax-in-forward-annotation`
@@ -954,7 +954,7 @@ NewAlias = TypeAliasType(get_name(), int)        # error: TypeAliasType name mus

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-alias-type)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L656)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L654)
 </details>

 ## `invalid-type-checking-constant`
@@ -983,7 +983,7 @@ TYPE_CHECKING = ''

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-checking-constant)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L849)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L847)
 </details>

 ## `invalid-type-form`
@@ -1012,7 +1012,7 @@ b: Annotated[int]  # `Annotated` expects at least two arguments

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-form)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L873)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L871)
 </details>

 ## `invalid-type-variable-constraints`
@@ -1046,7 +1046,7 @@ T = TypeVar('T', bound=str)  # valid bound TypeVar

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-variable-constraints)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L897)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L895)
 </details>

 ## `missing-argument`
@@ -1070,7 +1070,7 @@ func()  # TypeError: func() missing 1 required positional argument: 'x'

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20missing-argument)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L926)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L924)
 </details>

 ## `no-matching-overload`
@@ -1098,7 +1098,7 @@ func("string")  # error: [no-matching-overload]

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20no-matching-overload)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L945)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L943)
 </details>

 ## `non-subscriptable`
@@ -1121,7 +1121,7 @@ Subscripting an object that does not support it will raise a `TypeError` at runt

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20non-subscriptable)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L968)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L966)
 </details>

 ## `not-iterable`
@@ -1146,7 +1146,7 @@ for i in 34:  # TypeError: 'int' object is not iterable

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20not-iterable)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L986)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L984)
 </details>

 ## `parameter-already-assigned`
@@ -1172,7 +1172,7 @@ f(1, x=2)  # Error raised here

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20parameter-already-assigned)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1037)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1035)
 </details>

 ## `raw-string-type-annotation`
@@ -1231,7 +1231,7 @@ static_assert(int(2.0 * 3.0) == 6)  # error: does not have a statically known tr

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20static-assert-error)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1373)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1371)
 </details>

 ## `subclass-of-final-class`
@@ -1259,7 +1259,7 @@ class B(A): ...  # Error raised here

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20subclass-of-final-class)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1128)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1126)
 </details>

 ## `too-many-positional-arguments`
@@ -1285,7 +1285,7 @@ f("foo")  # Error raised here

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20too-many-positional-arguments)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1173)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1171)
 </details>

 ## `type-assertion-failure`
@@ -1312,7 +1312,7 @@ def _(x: int):

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20type-assertion-failure)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1151)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1149)
 </details>

 ## `unavailable-implicit-super-arguments`
@@ -1356,7 +1356,7 @@ class A:

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unavailable-implicit-super-arguments)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1194)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1192)
 </details>

 ## `unknown-argument`
@@ -1382,7 +1382,7 @@ f(x=1, y=2)  # Error raised here

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unknown-argument)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1251)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1249)
 </details>

 ## `unresolved-attribute`
@@ -1409,7 +1409,7 @@ A().foo  # AttributeError: 'A' object has no attribute 'foo'

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-attribute)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1272)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1270)
 </details>

 ## `unresolved-import`
@@ -1433,7 +1433,7 @@ import foo  # ModuleNotFoundError: No module named 'foo'

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-import)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1294)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1292)
 </details>

 ## `unresolved-reference`
@@ -1457,7 +1457,7 @@ print(x)  # NameError: name 'x' is not defined

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-reference)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1313)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1311)
 </details>

 ## `unsupported-bool-conversion`
@@ -1493,7 +1493,7 @@ b1 < b2 < b1  # exception raised here

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-bool-conversion)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1006)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1004)
 </details>

 ## `unsupported-operator`
@@ -1520,7 +1520,7 @@ A() + A()  # TypeError: unsupported operand type(s) for +: 'A' and 'A'

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-operator)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1332)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1330)
 </details>

 ## `zero-stepsize-in-slice`
@@ -1544,7 +1544,7 @@ l[1:10:0]  # ValueError: slice step cannot be zero

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20zero-stepsize-in-slice)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1354)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1352)
 </details>

 ## `invalid-ignore-comment`
@@ -1600,7 +1600,7 @@ A.c  # AttributeError: type object 'A' has no attribute 'c'

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-unbound-attribute)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1058)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1056)
 </details>

 ## `possibly-unbound-implicit-call`
@@ -1631,7 +1631,7 @@ A()[0]  # TypeError: 'A' object is not subscriptable

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-unbound-implicit-call)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L111)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L109)
 </details>

 ## `possibly-unbound-import`
@@ -1662,7 +1662,7 @@ from module import a  # ImportError: cannot import name 'a' from 'module'

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-unbound-import)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1080)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1078)
 </details>

 ## `redundant-cast`
@@ -1688,7 +1688,7 @@ cast(int, f())  # Redundant

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20redundant-cast)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1425)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1423)
 </details>

 ## `undefined-reveal`
@@ -1711,7 +1711,7 @@ reveal_type(1)  # NameError: name 'reveal_type' is not defined

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20undefined-reveal)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1233)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1231)
 </details>

 ## `unknown-rule`
@@ -1779,7 +1779,7 @@ class D(C): ...  # error: [unsupported-base]

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-base)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L489)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L487)
 </details>

 ## `division-by-zero`
@@ -1802,7 +1802,7 @@ Dividing by zero raises a `ZeroDivisionError` at runtime.

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20division-by-zero)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L240)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L238)
 </details>

 ## `possibly-unresolved-reference`
@@ -1829,7 +1829,7 @@ print(x)  # NameError: name 'x' is not defined

 ### Links
 * [Related issues](https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-unresolved-reference)
-* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1106)
+* [View source](https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1104)
 </details>

 ## `unused-ignore-comment`
--- a/crates/ty/src/args.rs
+++ b/crates/ty/src/args.rs
@@ -4,7 +4,7 @@ use clap::error::ErrorKind;
 use clap::{ArgAction, ArgMatches, Error, Parser};
 use ruff_db::system::SystemPathBuf;
 use ty_project::combine::Combine;
-use ty_project::metadata::options::{EnvironmentOptions, Options, SrcOptions, TerminalOptions};
+use ty_project::metadata::options::{EnvironmentOptions, Options, TerminalOptions};
 use ty_project::metadata::value::{RangedValue, RelativePathBuf, ValueSource};
 use ty_python_semantic::lint;

@@ -107,12 +107,6 @@ pub(crate) struct CheckCommand {
    #[clap(flatten)]
    pub(crate) config: ConfigsArg,

-    /// The path to a `ty.toml` file to use for configuration.
-    ///
-    /// While ty configuration can be included in a `pyproject.toml` file, it is not allowed in this context.
-    #[arg(long, env = "TY_CONFIG_FILE", value_name = "PATH")]
-    pub(crate) config_file: Option<SystemPathBuf>,
-
    /// The format to use for printing diagnostic messages.
    #[arg(long)]
    pub(crate) output_format: Option<OutputFormat>,
@@ -190,11 +184,9 @@ impl CheckCommand {
                    .map(|output_format| RangedValue::cli(output_format.into())),
                error_on_warning: self.error_on_warning,
            }),
-            src: Some(SrcOptions {
-                respect_ignore_files,
-                ..SrcOptions::default()
-            }),
            rules,
+            respect_ignore_files,
+            ..Default::default()
        };
        // Merge with options passed in via --config
        options.combine(self.config.into_options().unwrap_or_default())
@@ -330,11 +322,9 @@ pub(crate) enum TerminalColor {
    /// Never display colors.
    Never,
 }
-
 /// A TOML `<KEY> = <VALUE>` pair
 /// (such as you might find in a `ty.toml` configuration file)
 /// overriding a specific configuration option.
-///
 /// Overrides of individual settings using this option always take precedence
 /// over all configuration files.
 #[derive(Debug, Clone)]
@@ -369,15 +359,7 @@ impl clap::Args for ConfigsArg {
                .short('c')
                .long("config")
                .value_name("CONFIG_OPTION")
-                .help("A TOML `<KEY> = <VALUE>` pair overriding a specific configuration option.")
-                .long_help(
-                    "
-A TOML `<KEY> = <VALUE>` pair (such as you might find in a `ty.toml` configuration file)
-overriding a specific configuration option.
-
-Overrides of individual settings using this option always take precedence
-over all configuration files.",
-                )
+                .help("A TOML `<KEY> = <VALUE>` pair")
                .action(ArgAction::Append),
        )
    }
--- a/crates/ty/src/lib.rs
+++ b/crates/ty/src/lib.rs
@@ -23,7 +23,7 @@ use ruff_db::diagnostic::{Diagnostic, DisplayDiagnosticConfig, Severity};
 use ruff_db::max_parallelism;
 use ruff_db::system::{OsSystem, SystemPath, SystemPathBuf};
 use salsa::plumbing::ZalsaDatabase;
-use ty_project::metadata::options::ProjectOptionsOverrides;
+use ty_project::metadata::options::Options;
 use ty_project::watch::ProjectWatcher;
 use ty_project::{Db, DummyReporter, Reporter, watch};
 use ty_project::{ProjectDatabase, ProjectMetadata};
@@ -102,21 +102,13 @@ fn run_check(args: CheckCommand) -> anyhow::Result<ExitStatus> {
        .map(|path| SystemPath::absolute(path, &cwd))
        .collect();

-    let system = OsSystem::new(&cwd);
+    let system = OsSystem::new(cwd);
    let watch = args.watch;
    let exit_zero = args.exit_zero;
-    let config_file = args
-        .config_file
-        .as_ref()
-        .map(|path| SystemPath::absolute(path, &cwd));

-    let mut project_metadata = match &config_file {
-        Some(config_file) => ProjectMetadata::from_config_file(config_file.clone(), &system)?,
-        None => ProjectMetadata::discover(&project_path, &system)?,
-    };
-
-    let options = args.into_options();
-    project_metadata.apply_options(options.clone());
+    let cli_options = args.into_options();
+    let mut project_metadata = ProjectMetadata::discover(&project_path, &system)?;
+    project_metadata.apply_cli_options(cli_options.clone());
    project_metadata.apply_configuration_files(&system)?;

    let mut db = ProjectDatabase::new(project_metadata, system)?;
@@ -125,8 +117,7 @@ fn run_check(args: CheckCommand) -> anyhow::Result<ExitStatus> {
        db.project().set_included_paths(&mut db, check_paths);
    }

-    let project_options_overrides = ProjectOptionsOverrides::new(config_file, options);
-    let (main_loop, main_loop_cancellation_token) = MainLoop::new(project_options_overrides);
+    let (main_loop, main_loop_cancellation_token) = MainLoop::new(cli_options);

    // Listen to Ctrl+C and abort the watch mode.
    let main_loop_cancellation_token = Mutex::new(Some(main_loop_cancellation_token));
@@ -187,13 +178,11 @@ struct MainLoop {
    /// The file system watcher, if running in watch mode.
    watcher: Option<ProjectWatcher>,

-    project_options_overrides: ProjectOptionsOverrides,
+    cli_options: Options,
 }

 impl MainLoop {
-    fn new(
-        project_options_overrides: ProjectOptionsOverrides,
-    ) -> (Self, MainLoopCancellationToken) {
+    fn new(cli_options: Options) -> (Self, MainLoopCancellationToken) {
        let (sender, receiver) = crossbeam_channel::bounded(10);

        (
@@ -201,7 +190,7 @@ impl MainLoop {
                sender: sender.clone(),
                receiver,
                watcher: None,
-                project_options_overrides,
+                cli_options,
            },
            MainLoopCancellationToken { sender },
        )
@@ -254,14 +243,12 @@ impl MainLoop {
                MainLoopMessage::CheckWorkspace => {
                    let db = db.clone();
                    let sender = self.sender.clone();
+                    let mut reporter = R::default();

                    // Spawn a new task that checks the project. This needs to be done in a separate thread
                    // to prevent blocking the main loop here.
                    rayon::spawn(move || {
-                        match salsa::Cancelled::catch(|| {
-                            let mut reporter = R::default();
-                            db.check_with_reporter(&mut reporter)
-                        }) {
+                        match db.check_with_reporter(&mut reporter) {
                            Ok(result) => {
                                // Send the result back to the main loop for printing.
                                sender
@@ -351,7 +338,7 @@ impl MainLoop {
                MainLoopMessage::ApplyChanges(changes) => {
                    revision += 1;
                    // Automatically cancels any pending queries and waits for them to complete.
-                    db.apply_changes(changes, Some(&self.project_options_overrides));
+                    db.apply_changes(changes, Some(&self.cli_options));
                    if let Some(watcher) = self.watcher.as_mut() {
                        watcher.update(db);
                    }
--- a/crates/ty/tests/cli.rs
+++ b/crates/ty/tests/cli.rs
@@ -85,7 +85,7 @@ fn test_respect_ignore_files() -> anyhow::Result<()> {
    ");

    // Test that we can set to false via config file
-    case.write_file("ty.toml", "src.respect-ignore-files = false")?;
+    case.write_file("ty.toml", "respect-ignore-files = false")?;
    assert_cmd_snapshot!(case.command(), @r"
    success: false
    exit_code: 1
@@ -104,7 +104,7 @@ fn test_respect_ignore_files() -> anyhow::Result<()> {
    ");

    // Ensure CLI takes precedence
-    case.write_file("ty.toml", "src.respect-ignore-files = true")?;
+    case.write_file("ty.toml", "respect-ignore-files = true")?;
    assert_cmd_snapshot!(case.command().arg("--no-respect-ignore-files"), @r"
    success: false
    exit_code: 1
@@ -242,7 +242,7 @@ fn config_override_python_platform() -> anyhow::Result<()> {
 }

 #[test]
-fn config_file_annotation_showing_where_python_version_set_typing_error() -> anyhow::Result<()> {
+fn config_file_annotation_showing_where_python_version_set() -> anyhow::Result<()> {
    let case = TestCase::with_files([
        (
            "pyproject.toml",
@@ -308,77 +308,6 @@ fn config_file_annotation_showing_where_python_version_set_typing_error() -> any
    Ok(())
 }

-#[test]
-fn config_file_annotation_showing_where_python_version_set_syntax_error() -> anyhow::Result<()> {
-    let case = TestCase::with_files([
-        (
-            "pyproject.toml",
-            r#"
-            [project]
-            requires-python = ">=3.8"
-            "#,
-        ),
-        (
-            "test.py",
-            r#"
-            match object():
-                case int():
-                    pass
-                case _:
-                    pass
-            "#,
-        ),
-    ])?;
-
-    assert_cmd_snapshot!(case.command(), @r#"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    error[invalid-syntax]
-     --> test.py:2:1
-      |
-    2 | match object():
-      | ^^^^^ Cannot use `match` statement on Python 3.8 (syntax was added in Python 3.10)
-    3 |     case int():
-    4 |         pass
-      |
-    info: Python 3.8 was assumed when parsing syntax
-     --> pyproject.toml:3:19
-      |
-    2 | [project]
-    3 | requires-python = ">=3.8"
-      |                   ^^^^^^^ Python 3.8 assumed due to this configuration setting
-      |
-
-    Found 1 diagnostic
-
-    ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    "#);
-
-    assert_cmd_snapshot!(case.command().arg("--python-version=3.9"), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    error[invalid-syntax]
-     --> test.py:2:1
-      |
-    2 | match object():
-      | ^^^^^ Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
-    3 |     case int():
-    4 |         pass
-      |
-    info: Python 3.9 was assumed when parsing syntax because it was specified on the command line
-
-    Found 1 diagnostic
-
-    ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
-
-    Ok(())
-}
-
 /// Paths specified on the CLI are relative to the current working directory and not the project root.
 ///
 /// We test this by adding an extra search path from the CLI to the libs directory when
@@ -1605,7 +1534,7 @@ fn cli_config_args_later_overrides_earlier() -> anyhow::Result<()> {
 #[test]
 fn cli_config_args_invalid_option() -> anyhow::Result<()> {
    let case = TestCase::with_file("test.py", r"print(1)")?;
-    assert_cmd_snapshot!(case.command().arg("--config").arg("bad-option=true"), @r###"
+    assert_cmd_snapshot!(case.command().arg("--config").arg("bad-option=true"), @r"
    success: false
    exit_code: 2
    ----- stdout -----
@@ -1615,146 +1544,12 @@ fn cli_config_args_invalid_option() -> anyhow::Result<()> {
      |
    1 | bad-option=true
      | ^^^^^^^^^^
-    unknown field `bad-option`, expected one of `environment`, `src`, `rules`, `terminal`
+    unknown field `bad-option`, expected one of `environment`, `src`, `rules`, `terminal`, `respect-ignore-files`


    Usage: ty <COMMAND>

    For more information, try '--help'.
-    "###);
-
-    Ok(())
-}
-
-/// The `site-packages` directory is used by ty for external import.
-/// Ty does the following checks to discover the `site-packages` directory in the order:
-/// 1) If `VIRTUAL_ENV` environment variable is set
-/// 2) If `CONDA_PREFIX` environment variable is set
-/// 3) If a `.venv` directory exists at the project root
-///
-/// This test is aiming at validating the logic around `CONDA_PREFIX`.
-///
-/// A conda-like environment file structure is used
-/// We test by first not setting the `CONDA_PREFIX` and expect a fail.
-/// Then we test by setting `CONDA_PREFIX` to `conda-env` and expect a pass.
-///
-/// ├── project
-/// │   └── test.py
-/// └── conda-env
-///     └── lib
-///         └── python3.13
-///             └── site-packages
-///                 └── package1
-///                     └── __init__.py
-///
-/// test.py imports package1
-/// And the command is run in the `project` directory.
-#[test]
-fn check_conda_prefix_var_to_resolve_path() -> anyhow::Result<()> {
-    let conda_package1_path = if cfg!(windows) {
-        "conda-env/Lib/site-packages/package1/__init__.py"
-    } else {
-        "conda-env/lib/python3.13/site-packages/package1/__init__.py"
-    };
-
-    let case = TestCase::with_files([
-        (
-            "project/test.py",
-            r#"
-            import package1
-            "#,
-        ),
-        (
-            conda_package1_path,
-            r#"
-            "#,
-        ),
-    ])?;
-
-    assert_cmd_snapshot!(case.command().current_dir(case.root().join("project")), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    error[unresolved-import]: Cannot resolve imported module `package1`
-     --> test.py:2:8
-      |
-    2 | import package1
-      |        ^^^^^^^^
-      |
-    info: make sure your Python environment is properly configured: https://github.com/astral-sh/ty/blob/main/docs/README.md#python-environment
-    info: rule `unresolved-import` is enabled by default
-
-    Found 1 diagnostic
-
-    ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
-
-    // do command : CONDA_PREFIX=<temp_dir>/conda_env
-    assert_cmd_snapshot!(case.command().current_dir(case.root().join("project")).env("CONDA_PREFIX", case.root().join("conda-env")), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
-
-    ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
-
-    Ok(())
-}
-
-#[test]
-fn config_file_override() -> anyhow::Result<()> {
-    // Set `error-on-warning` to true in the configuration file
-    // Explicitly set `--warn unresolved-reference` to ensure the rule warns instead of errors
-    let case = TestCase::with_files(vec![
-        ("test.py", r"print(x)  # [unresolved-reference]"),
-        (
-            "ty-override.toml",
-            r#"
-            [terminal]
-            error-on-warning = true
-            "#,
-        ),
-    ])?;
-
-    // Ensure flag works via CLI arg
-    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference").arg("--config-file").arg("ty-override.toml"), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    warning[unresolved-reference]: Name `x` used when not defined
-     --> test.py:1:7
-      |
-    1 | print(x)  # [unresolved-reference]
-      |       ^
-      |
-    info: rule `unresolved-reference` was selected on the command line
-
-    Found 1 diagnostic
-
-    ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
-    ");
-
-    // Ensure the flag works via an environment variable
-    assert_cmd_snapshot!(case.command().arg("--warn").arg("unresolved-reference").env("TY_CONFIG_FILE", "ty-override.toml"), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    warning[unresolved-reference]: Name `x` used when not defined
-     --> test.py:1:7
-      |
-    1 | print(x)  # [unresolved-reference]
-      |       ^
-      |
-    info: rule `unresolved-reference` was selected on the command line
-
-    Found 1 diagnostic
-
-    ----- stderr -----
-    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
    ");

    Ok(())
--- a/crates/ty/tests/file_watching.rs
+++ b/crates/ty/tests/file_watching.rs
@@ -10,7 +10,7 @@ use ruff_db::system::{
 };
 use ruff_db::{Db as _, Upcast};
 use ruff_python_ast::PythonVersion;
-use ty_project::metadata::options::{EnvironmentOptions, Options, ProjectOptionsOverrides};
+use ty_project::metadata::options::{EnvironmentOptions, Options};
 use ty_project::metadata::pyproject::{PyProject, Tool};
 use ty_project::metadata::value::{RangedValue, RelativePathBuf};
 use ty_project::watch::{ChangeEvent, ProjectWatcher, directory_watcher};
@@ -164,12 +164,8 @@ impl TestCase {
        Ok(all_events)
    }

-    fn apply_changes(
-        &mut self,
-        changes: Vec<ChangeEvent>,
-        project_options_overrides: Option<&ProjectOptionsOverrides>,
-    ) {
-        self.db.apply_changes(changes, project_options_overrides);
+    fn apply_changes(&mut self, changes: Vec<ChangeEvent>) {
+        self.db.apply_changes(changes, None);
    }

    fn update_options(&mut self, options: Options) -> anyhow::Result<()> {
@@ -184,7 +180,7 @@ impl TestCase {
        .context("Failed to write configuration")?;

        let changes = self.take_watch_changes(event_for_file("pyproject.toml"));
-        self.apply_changes(changes, None);
+        self.apply_changes(changes);

        if let Some(watcher) = &mut self.watcher {
            watcher.update(&self.db);
@@ -480,7 +476,7 @@ fn new_file() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("foo.py"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    let foo = case.system_file(&foo_path).expect("foo.py to exist.");

@@ -503,7 +499,7 @@ fn new_ignored_file() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("foo.py"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    assert!(case.system_file(&foo_path).is_ok());
    case.assert_indexed_project_files([bar_file]);
@@ -539,7 +535,7 @@ fn new_non_project_file() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("black.py"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    assert!(case.system_file(&black_path).is_ok());

@@ -580,7 +576,7 @@ fn new_files_with_explicit_included_paths() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("test2.py"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    let sub_a_file = case.system_file(&sub_a_path).expect("sub/a.py to exist");

@@ -625,7 +621,7 @@ fn new_file_in_included_out_of_project_directory() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("script2.py"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    let src_a_file = case.system_file(&src_a).unwrap();
    let outside_b_file = case.system_file(&outside_b_path).unwrap();
@@ -652,7 +648,7 @@ fn changed_file() -> anyhow::Result<()> {

    assert!(!changes.is_empty());

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    assert_eq!(source_text(case.db(), foo).as_str(), "print('Version 2')");
    case.assert_indexed_project_files([foo]);
@@ -675,7 +671,7 @@ fn deleted_file() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("foo.py"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    assert!(!foo.exists(case.db()));
    case.assert_indexed_project_files([]);
@@ -707,7 +703,7 @@ fn move_file_to_trash() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("foo.py"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    assert!(!foo.exists(case.db()));
    case.assert_indexed_project_files([]);
@@ -734,7 +730,7 @@ fn move_file_to_project() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("foo.py"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    let foo_in_project = case.system_file(&foo_in_project)?;

@@ -759,7 +755,7 @@ fn rename_file() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("bar.py"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    assert!(!foo.exists(case.db()));

@@ -800,7 +796,7 @@ fn directory_moved_to_project() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("sub"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    let init_file = case
        .system_file(sub_new_path.join("__init__.py"))
@@ -857,7 +853,7 @@ fn directory_moved_to_trash() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("sub"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    // `import sub.a` should no longer resolve
    assert!(
@@ -920,7 +916,7 @@ fn directory_renamed() -> anyhow::Result<()> {
    // Linux and windows only emit an event for the newly created root directory, but not for every new component.
    let changes = case.stop_watch(event_for_file("sub"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    // `import sub.a` should no longer resolve
    assert!(
@@ -993,7 +989,7 @@ fn directory_deleted() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("sub"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    // `import sub.a` should no longer resolve
    assert!(
@@ -1039,7 +1035,7 @@ fn search_path() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("a.py"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    assert!(resolve_module(case.db().upcast(), &ModuleName::new_static("a").unwrap()).is_some());
    case.assert_indexed_project_files([case.system_file(case.project_path("bar.py")).unwrap()]);
@@ -1070,7 +1066,7 @@ fn add_search_path() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("a.py"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    assert!(resolve_module(case.db().upcast(), &ModuleName::new_static("a").unwrap()).is_some());

@@ -1139,7 +1135,7 @@ print(sys.last_exc, os.getegid())
        Ok(())
    })?;

-    let diagnostics = case.db.check();
+    let diagnostics = case.db.check().context("Failed to check project.")?;

    assert_eq!(diagnostics.len(), 2);
    assert_eq!(
@@ -1164,7 +1160,7 @@ print(sys.last_exc, os.getegid())
    })
    .expect("Search path settings to be valid");

-    let diagnostics = case.db.check();
+    let diagnostics = case.db.check().context("Failed to check project.")?;
    assert!(diagnostics.is_empty());

    Ok(())
@@ -1217,7 +1213,7 @@ fn changed_versions_file() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("VERSIONS"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    assert!(resolve_module(case.db(), &ModuleName::new("os").unwrap()).is_some());

@@ -1271,7 +1267,7 @@ fn hard_links_in_project() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("foo.py"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    assert_eq!(source_text(case.db(), foo).as_str(), "print('Version 2')");

@@ -1342,7 +1338,7 @@ fn hard_links_to_target_outside_project() -> anyhow::Result<()> {

    let changes = case.stop_watch(ChangeEvent::is_changed);

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    assert_eq!(source_text(case.db(), bar).as_str(), "print('Version 2')");

@@ -1381,7 +1377,7 @@ mod unix {

        let changes = case.stop_watch(event_for_file("foo.py"));

-        case.apply_changes(changes, None);
+        case.apply_changes(changes);

        assert_eq!(
            foo.permissions(case.db()),
@@ -1464,7 +1460,7 @@ mod unix {

        let changes = case.take_watch_changes(event_for_file("baz.py"));

-        case.apply_changes(changes, None);
+        case.apply_changes(changes);

        assert_eq!(
            source_text(case.db(), baz_file).as_str(),
@@ -1477,7 +1473,7 @@ mod unix {

        let changes = case.stop_watch(event_for_file("baz.py"));

-        case.apply_changes(changes, None);
+        case.apply_changes(changes);

        assert_eq!(
            source_text(case.db(), baz_file).as_str(),
@@ -1548,7 +1544,7 @@ mod unix {

        let changes = case.stop_watch(event_for_file("baz.py"));

-        case.apply_changes(changes, None);
+        case.apply_changes(changes);

        // The file watcher is guaranteed to emit one event for the changed file, but it isn't specified
        // if the event is emitted for the "original" or linked path because both paths are watched.
@@ -1662,7 +1658,7 @@ mod unix {

        let changes = case.stop_watch(event_for_file("baz.py"));

-        case.apply_changes(changes, None);
+        case.apply_changes(changes);

        assert_eq!(
            source_text(case.db(), baz_original_file).as_str(),
@@ -1719,7 +1715,7 @@ fn nested_projects_delete_root() -> anyhow::Result<()> {

    let changes = case.stop_watch(ChangeEvent::is_deleted);

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    // It should now pick up the outer project.
    assert_eq!(case.db().project().root(case.db()), case.root_path());
@@ -1767,7 +1763,10 @@ fn changes_to_user_configuration() -> anyhow::Result<()> {
    let foo = case
        .system_file(case.project_path("foo.py"))
        .expect("foo.py to exist");
-    let diagnostics = case.db().check_file(foo);
+    let diagnostics = case
+        .db()
+        .check_file(foo)
+        .context("Failed to check project.")?;

    assert!(
        diagnostics.is_empty(),
@@ -1785,75 +1784,12 @@ fn changes_to_user_configuration() -> anyhow::Result<()> {

    let changes = case.stop_watch(event_for_file("ty.toml"));

-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

-    let diagnostics = case.db().check_file(foo);
-
-    assert!(
-        diagnostics.len() == 1,
-        "Expected exactly one diagnostic but got: {diagnostics:#?}"
-    );
-
-    Ok(())
-}
-
-#[test]
-fn changes_to_config_file_override() -> anyhow::Result<()> {
-    let mut case = setup(|context: &mut SetupContext| {
-        std::fs::write(
-            context.join_project_path("pyproject.toml").as_std_path(),
-            r#"
-            [project]
-            name = "test"
-            "#,
-        )?;
-
-        std::fs::write(
-            context.join_project_path("foo.py").as_std_path(),
-            "a = 10 / 0",
-        )?;
-
-        std::fs::write(
-            context.join_project_path("ty-override.toml").as_std_path(),
-            r#"
-            [rules]
-            division-by-zero = "ignore"
-            "#,
-        )?;
-
-        Ok(())
-    })?;
-
-    let foo = case
-        .system_file(case.project_path("foo.py"))
-        .expect("foo.py to exist");
-    let diagnostics = case.db().check_file(foo);
-
-    assert!(
-        diagnostics.is_empty(),
-        "Expected no diagnostics but got: {diagnostics:#?}"
-    );
-
-    // Enable division-by-zero in the explicitly specified configuration with warning severity
-    update_file(
-        case.project_path("ty-override.toml"),
-        r#"
-        [rules]
-        division-by-zero = "warn"
-        "#,
-    )?;
-
-    let changes = case.stop_watch(event_for_file("ty-override.toml"));
-
-    case.apply_changes(
-        changes,
-        Some(&ProjectOptionsOverrides::new(
-            Some(case.project_path("ty-override.toml")),
-            Options::default(),
-        )),
-    );
-
-    let diagnostics = case.db().check_file(foo);
+    let diagnostics = case
+        .db()
+        .check_file(foo)
+        .context("Failed to check project.")?;

    assert!(
        diagnostics.len() == 1,
@@ -1925,7 +1861,7 @@ fn rename_files_casing_only() -> anyhow::Result<()> {
    }

    let changes = case.stop_watch(event_for_file("Lib.py"));
-    case.apply_changes(changes, None);
+    case.apply_changes(changes);

    // Resolving `lib` should now fail but `Lib` should now succeed
    assert_eq!(
--- a/crates/ty_project/resources/test/corpus/ty_extensions.py
+++ b/crates/ty_project/resources/test/corpus/ty_extensions.py
@@ -1,30 +0,0 @@
-"""
-Make sure that types are inferred for all subexpressions of the following
-annotations involving ty_extension `_SpecialForm`s.
-
-This is a regression test for https://github.com/astral-sh/ty/issues/366
-"""
-
-from ty_extensions import CallableTypeOf, Intersection, Not, TypeOf
-
-
-class A: ...
-
-
-class B: ...
-
-
-def _(x: Not[A]):
-    pass
-
-
-def _(x: Intersection[A], y: Intersection[A, B]):
-    pass
-
-
-def _(x: TypeOf[1j]):
-    pass
-
-
-def _(x: CallableTypeOf[str]):
-    pass
--- a/crates/ty_project/src/db.rs
+++ b/crates/ty_project/src/db.rs
@@ -8,8 +8,8 @@ use ruff_db::files::{File, Files};
 use ruff_db::system::System;
 use ruff_db::vendored::VendoredFileSystem;
 use ruff_db::{Db as SourceDb, Upcast};
-use salsa::Event;
 use salsa::plumbing::ZalsaDatabase;
+use salsa::{Cancelled, Event};
 use ty_ide::Db as IdeDb;
 use ty_python_semantic::lint::{LintRegistry, RuleSelection};
 use ty_python_semantic::{Db as SemanticDb, Program};
@@ -76,21 +76,24 @@ impl ProjectDatabase {
    }

    /// Checks all open files in the project and its dependencies.
-    pub fn check(&self) -> Vec<Diagnostic> {
+    pub fn check(&self) -> Result<Vec<Diagnostic>, Cancelled> {
        let mut reporter = DummyReporter;
        let reporter = AssertUnwindSafe(&mut reporter as &mut dyn Reporter);
-        self.project().check(self, reporter)
+        self.with_db(|db| db.project().check(db, reporter))
    }

    /// Checks all open files in the project and its dependencies, using the given reporter.
-    pub fn check_with_reporter(&self, reporter: &mut dyn Reporter) -> Vec<Diagnostic> {
+    pub fn check_with_reporter(
+        &self,
+        reporter: &mut dyn Reporter,
+    ) -> Result<Vec<Diagnostic>, Cancelled> {
        let reporter = AssertUnwindSafe(reporter);
-        self.project().check(self, reporter)
+        self.with_db(|db| db.project().check(db, reporter))
    }

    #[tracing::instrument(level = "debug", skip(self))]
-    pub fn check_file(&self, file: File) -> Vec<Diagnostic> {
-        self.project().check_file(self, file)
+    pub fn check_file(&self, file: File) -> Result<Vec<Diagnostic>, Cancelled> {
+        self.with_db(|db| self.project().check_file(db, file))
    }

    /// Returns a mutable reference to the system.
@@ -104,6 +107,13 @@ impl ProjectDatabase {
        Arc::get_mut(&mut self.system)
            .expect("ref count should be 1 because `zalsa_mut` drops all other DB references.")
    }
+
+    pub(crate) fn with_db<F, T>(&self, f: F) -> Result<T, Cancelled>
+    where
+        F: FnOnce(&ProjectDatabase) -> T + std::panic::UnwindSafe,
+    {
+        Cancelled::catch(|| f(self))
+    }
 }

 impl Upcast<dyn SemanticDb> for ProjectDatabase {
--- a/crates/ty_project/src/db/changes.rs
+++ b/crates/ty_project/src/db/changes.rs
@@ -1,5 +1,5 @@
 use crate::db::{Db, ProjectDatabase};
-use crate::metadata::options::ProjectOptionsOverrides;
+use crate::metadata::options::Options;
 use crate::watch::{ChangeEvent, CreatedKind, DeletedKind};
 use crate::{Project, ProjectMetadata};
 use std::collections::BTreeSet;
@@ -11,46 +11,20 @@ use ruff_db::system::SystemPath;
 use rustc_hash::FxHashSet;
 use ty_python_semantic::Program;

-/// Represents the result of applying changes to the project database.
-pub struct ChangeResult {
-    project_changed: bool,
-    custom_stdlib_changed: bool,
-}
-
-impl ChangeResult {
-    /// Returns `true` if the project structure has changed.
-    pub fn project_changed(&self) -> bool {
-        self.project_changed
-    }
-
-    /// Returns `true` if the custom stdlib's VERSIONS file has changed.
-    pub fn custom_stdlib_changed(&self) -> bool {
-        self.custom_stdlib_changed
-    }
-}
-
 impl ProjectDatabase {
-    #[tracing::instrument(level = "debug", skip(self, changes, project_options_overrides))]
-    pub fn apply_changes(
-        &mut self,
-        changes: Vec<ChangeEvent>,
-        project_options_overrides: Option<&ProjectOptionsOverrides>,
-    ) -> ChangeResult {
+    #[tracing::instrument(level = "debug", skip(self, changes, cli_options))]
+    pub fn apply_changes(&mut self, changes: Vec<ChangeEvent>, cli_options: Option<&Options>) {
        let mut project = self.project();
        let project_root = project.root(self).to_path_buf();
-        let config_file_override =
-            project_options_overrides.and_then(|options| options.config_file_override.clone());
-        let options =
-            project_options_overrides.map(|project_options| project_options.options.clone());
        let program = Program::get(self);
        let custom_stdlib_versions_path = program
            .custom_stdlib_search_path(self)
            .map(|path| path.join("VERSIONS"));

-        let mut result = ChangeResult {
-            project_changed: false,
-            custom_stdlib_changed: false,
-        };
+        // Are there structural changes to the project
+        let mut project_changed = false;
+        // Changes to a custom stdlib path's VERSIONS
+        let mut custom_stdlib_change = false;
        // Paths that were added
        let mut added_paths = FxHashSet::default();

@@ -68,26 +42,18 @@ impl ProjectDatabase {
            tracing::trace!("Handle change: {:?}", change);

            if let Some(path) = change.system_path() {
-                if let Some(config_file) = &config_file_override {
-                    if config_file.as_path() == path {
-                        result.project_changed = true;
-
-                        continue;
-                    }
-                }
-
                if matches!(
                    path.file_name(),
                    Some(".gitignore" | ".ignore" | "ty.toml" | "pyproject.toml")
                ) {
                    // Changes to ignore files or settings can change the project structure or add/remove files.
-                    result.project_changed = true;
+                    project_changed = true;

                    continue;
                }

                if Some(path) == custom_stdlib_versions_path.as_deref() {
-                    result.custom_stdlib_changed = true;
+                    custom_stdlib_change = true;
                }
            }

@@ -150,7 +116,7 @@ impl ProjectDatabase {
                            .as_ref()
                            .is_some_and(|versions_path| versions_path.starts_with(&path))
                        {
-                            result.custom_stdlib_changed = true;
+                            custom_stdlib_change = true;
                        }

                        if project.is_path_included(self, &path) || path == project_root {
@@ -164,7 +130,7 @@ impl ProjectDatabase {
                            // We may want to make this more clever in the future, to e.g. iterate over the
                            // indexed files and remove the once that start with the same path, unless
                            // the deleted path is the project configuration.
-                            result.project_changed = true;
+                            project_changed = true;
                        }
                    }
                }
@@ -180,7 +146,7 @@ impl ProjectDatabase {
                }

                ChangeEvent::Rescan => {
-                    result.project_changed = true;
+                    project_changed = true;
                    Files::sync_all(self);
                    sync_recursively.clear();
                    break;
@@ -203,15 +169,11 @@ impl ProjectDatabase {
            last = Some(path);
        }

-        if result.project_changed {
-            let new_project_metadata = match config_file_override {
-                Some(config_file) => ProjectMetadata::from_config_file(config_file, self.system()),
-                None => ProjectMetadata::discover(&project_root, self.system()),
-            };
-            match new_project_metadata {
+        if project_changed {
+            match ProjectMetadata::discover(&project_root, self.system()) {
                Ok(mut metadata) => {
-                    if let Some(cli_options) = options {
-                        metadata.apply_options(cli_options);
+                    if let Some(cli_options) = cli_options {
+                        metadata.apply_cli_options(cli_options.clone());
                    }

                    if let Err(error) = metadata.apply_configuration_files(self.system()) {
@@ -245,8 +207,8 @@ impl ProjectDatabase {
                }
            }

-            return result;
-        } else if result.custom_stdlib_changed {
+            return;
+        } else if custom_stdlib_change {
            let search_paths = project
                .metadata(self)
                .to_program_settings(self.system())
@@ -276,7 +238,5 @@ impl ProjectDatabase {
        // implement a `BTreeMap` or similar and only prune the diagnostics from paths that we've
        // re-scanned (or that were removed etc).
        project.replace_index_diagnostics(self, diagnostics);
-
-        result
    }
 }
--- a/crates/ty_project/src/lib.rs
+++ b/crates/ty_project/src/lib.rs
@@ -5,7 +5,7 @@ use crate::walk::{ProjectFilesFilter, ProjectFilesWalker};
 pub use db::{Db, ProjectDatabase};
 use files::{Index, Indexed, IndexedFiles};
 use metadata::settings::Settings;
-pub use metadata::{ProjectMetadata, ProjectMetadataError};
+pub use metadata::{ProjectDiscoveryError, ProjectMetadata};
 use ruff_db::diagnostic::{
    Annotation, Diagnostic, DiagnosticId, Severity, Span, SubDiagnostic, create_parse_diagnostic,
    create_unsupported_syntax_diagnostic,
@@ -23,8 +23,8 @@ use std::sync::Arc;
 use thiserror::Error;
 use tracing::error;
 use ty_python_semantic::lint::{LintRegistry, LintRegistryBuilder, RuleSelection};
+use ty_python_semantic::register_lints;
 use ty_python_semantic::types::check_types;
-use ty_python_semantic::{add_inferred_python_version_hint_to_diagnostic, register_lints};

 pub mod combine;

@@ -460,11 +460,12 @@ fn check_file_impl(db: &dyn Db, file: File) -> Vec<Diagnostic> {
            .map(|error| create_parse_diagnostic(file, error)),
    );

-    diagnostics.extend(parsed.unsupported_syntax_errors().iter().map(|error| {
-        let mut error = create_unsupported_syntax_diagnostic(file, error);
-        add_inferred_python_version_hint_to_diagnostic(db.upcast(), &mut error, "parsing syntax");
-        error
-    }));
+    diagnostics.extend(
+        parsed
+            .unsupported_syntax_errors()
+            .iter()
+            .map(|error| create_unsupported_syntax_diagnostic(file, error)),
+    );

    {
        let db = AssertUnwindSafe(db);
--- a/crates/ty_project/src/metadata.rs
+++ b/crates/ty_project/src/metadata.rs
@@ -48,29 +48,6 @@ impl ProjectMetadata {
        }
    }

-    pub fn from_config_file(
-        path: SystemPathBuf,
-        system: &dyn System,
-    ) -> Result<Self, ProjectMetadataError> {
-        tracing::debug!("Using overridden configuration file at '{path}'");
-
-        let config_file = ConfigurationFile::from_path(path.clone(), system).map_err(|error| {
-            ProjectMetadataError::ConfigurationFileError {
-                source: Box::new(error),
-                path: path.clone(),
-            }
-        })?;
-
-        let options = config_file.into_options();
-
-        Ok(Self {
-            name: Name::new(system.current_directory().file_name().unwrap_or("root")),
-            root: system.current_directory().to_path_buf(),
-            options,
-            extra_configuration_paths: vec![path],
-        })
-    }
-
    /// Loads a project from a `pyproject.toml` file.
    pub(crate) fn from_pyproject(
        pyproject: PyProject,
@@ -129,11 +106,11 @@ impl ProjectMetadata {
    pub fn discover(
        path: &SystemPath,
        system: &dyn System,
-    ) -> Result<ProjectMetadata, ProjectMetadataError> {
+    ) -> Result<ProjectMetadata, ProjectDiscoveryError> {
        tracing::debug!("Searching for a project in '{path}'");

        if !system.is_directory(path) {
-            return Err(ProjectMetadataError::NotADirectory(path.to_path_buf()));
+            return Err(ProjectDiscoveryError::NotADirectory(path.to_path_buf()));
        }

        let mut closest_project: Option<ProjectMetadata> = None;
@@ -148,7 +125,7 @@ impl ProjectMetadata {
                ) {
                    Ok(pyproject) => Some(pyproject),
                    Err(error) => {
-                        return Err(ProjectMetadataError::InvalidPyProject {
+                        return Err(ProjectDiscoveryError::InvalidPyProject {
                            path: pyproject_path,
                            source: Box::new(error),
                        });
@@ -167,7 +144,7 @@ impl ProjectMetadata {
                ) {
                    Ok(options) => options,
                    Err(error) => {
-                        return Err(ProjectMetadataError::InvalidTyToml {
+                        return Err(ProjectDiscoveryError::InvalidTyToml {
                            path: ty_toml_path,
                            source: Box::new(error),
                        });
@@ -194,7 +171,7 @@ impl ProjectMetadata {
                        .and_then(|pyproject| pyproject.project.as_ref()),
                )
                .map_err(|err| {
-                    ProjectMetadataError::InvalidRequiresPythonConstraint {
+                    ProjectDiscoveryError::InvalidRequiresPythonConstraint {
                        source: err,
                        path: pyproject_path,
                    }
@@ -208,7 +185,7 @@ impl ProjectMetadata {
                let metadata =
                    ProjectMetadata::from_pyproject(pyproject, project_root.to_path_buf())
                        .map_err(
-                            |err| ProjectMetadataError::InvalidRequiresPythonConstraint {
+                            |err| ProjectDiscoveryError::InvalidRequiresPythonConstraint {
                                source: err,
                                path: pyproject_path,
                            },
@@ -272,7 +249,7 @@ impl ProjectMetadata {
    }

    /// Combine the project options with the CLI options where the CLI options take precedence.
-    pub fn apply_options(&mut self, options: Options) {
+    pub fn apply_cli_options(&mut self, options: Options) {
        self.options = options.combine(std::mem::take(&mut self.options));
    }

@@ -305,7 +282,7 @@ impl ProjectMetadata {
 }

 #[derive(Debug, Error)]
-pub enum ProjectMetadataError {
+pub enum ProjectDiscoveryError {
    #[error("project path '{0}' is not a directory")]
    NotADirectory(SystemPathBuf),

@@ -326,12 +303,6 @@ pub enum ProjectMetadataError {
        source: ResolveRequiresPythonError,
        path: SystemPathBuf,
    },
-
-    #[error("Error loading configuration file at {path}: {source}")]
-    ConfigurationFileError {
-        source: Box<ConfigurationFileError>,
-        path: SystemPathBuf,
-    },
 }

 #[cfg(test)]
@@ -343,7 +314,7 @@ mod tests {
    use ruff_db::system::{SystemPathBuf, TestSystem};
    use ruff_python_ast::PythonVersion;

-    use crate::{ProjectMetadata, ProjectMetadataError};
+    use crate::{ProjectDiscoveryError, ProjectMetadata};

    #[test]
    fn project_without_pyproject() -> anyhow::Result<()> {
@@ -1058,54 +1029,8 @@ expected `.`, `]`
        Ok(())
    }

-    #[test]
-    fn src_root_with_tests() -> anyhow::Result<()> {
-        let system = TestSystem::default();
-        let root = SystemPathBuf::from("/app");
-
-        // pytest will find `tests/test_foo.py` and realize it is NOT part of a package
-        // given that there's no `__init__.py` file in the same folder.
-        // It will then add `tests` to `sys.path`
-        // in order to import `test_foo.py` as the module `test_foo`.
-        system
-            .memory_file_system()
-            .write_files_all([
-                (root.join("src/main.py"), ""),
-                (root.join("tests/conftest.py"), ""),
-                (root.join("tests/test_foo.py"), ""),
-            ])
-            .context("Failed to write files")?;
-
-        let metadata = ProjectMetadata::discover(&root, &system)?;
-        let settings = metadata
-            .options
-            .to_program_settings(&root, "my_package", &system);
-
-        assert_eq!(
-            settings.search_paths.src_roots,
-            vec![root.clone(), root.join("src"), root.join("tests")]
-        );
-
-        // If `tests/__init__.py` is present, it is considered a package and `tests` is not added to `sys.path`.
-        system
-            .memory_file_system()
-            .write_file(root.join("tests/__init__.py"), "")
-            .context("Failed to write tests/__init__.py")?;
-        let metadata = ProjectMetadata::discover(&root, &system)?;
-        let settings = metadata
-            .options
-            .to_program_settings(&root, "my_package", &system);
-
-        assert_eq!(
-            settings.search_paths.src_roots,
-            vec![root.clone(), root.join("src")]
-        );
-
-        Ok(())
-    }
-
    #[track_caller]
-    fn assert_error_eq(error: &ProjectMetadataError, message: &str) {
+    fn assert_error_eq(error: &ProjectDiscoveryError, message: &str) {
        assert_eq!(error.to_string().replace('\\', "/"), message);
    }

--- a/crates/ty_project/src/metadata/configuration_file.rs
+++ b/crates/ty_project/src/metadata/configuration_file.rs
@@ -14,25 +14,6 @@ pub(crate) struct ConfigurationFile {
 }

 impl ConfigurationFile {
-    pub(crate) fn from_path(
-        path: SystemPathBuf,
-        system: &dyn System,
-    ) -> Result<Self, ConfigurationFileError> {
-        let ty_toml_str = system.read_to_string(&path).map_err(|source| {
-            ConfigurationFileError::FileReadError {
-                source,
-                path: path.clone(),
-            }
-        })?;
-
-        match Options::from_toml_str(&ty_toml_str, ValueSource::File(Arc::new(path.clone()))) {
-            Ok(options) => Ok(Self { path, options }),
-            Err(error) => Err(ConfigurationFileError::InvalidTyToml {
-                source: Box::new(error),
-                path,
-            }),
-        }
-    }
    /// Loads the user-level configuration file if it exists.
    ///
    /// Returns `None` if the file does not exist or if the concept of user-level configurations
@@ -85,10 +66,4 @@ pub enum ConfigurationFileError {
        source: Box<TyTomlError>,
        path: SystemPathBuf,
    },
-    #[error("Failed to read `{path}`: {source}")]
-    FileReadError {
-        #[source]
-        source: std::io::Error,
-        path: SystemPathBuf,
-    },
 }
--- a/crates/ty_project/src/metadata/options.rs
+++ b/crates/ty_project/src/metadata/options.rs
@@ -2,7 +2,7 @@ use crate::Db;
 use crate::metadata::value::{RangedValue, RelativePathBuf, ValueSource, ValueSourceGuard};
 use ruff_db::diagnostic::{Annotation, Diagnostic, DiagnosticFormat, DiagnosticId, Severity, Span};
 use ruff_db::files::system_path_to_file;
-use ruff_db::system::{System, SystemPath, SystemPathBuf};
+use ruff_db::system::{System, SystemPath};
 use ruff_macros::{Combine, OptionsMetadata};
 use ruff_python_ast::PythonVersion;
 use rustc_hash::FxHashMap;
@@ -57,6 +57,19 @@ pub struct Options {
    #[serde(skip_serializing_if = "Option::is_none")]
    #[option_group]
    pub terminal: Option<TerminalOptions>,
+
+    /// Whether to automatically exclude files that are ignored by `.ignore`,
+    /// `.gitignore`, `.git/info/exclude`, and global `gitignore` files.
+    /// Enabled by default.
+    #[option(
+        default = r#"true"#,
+        value_type = r#"bool"#,
+        example = r#"
+            respect-ignore-files = false
+        "#
+    )]
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub respect_ignore_files: Option<bool>,
 }

 impl Options {
@@ -122,7 +135,7 @@ impl Options {
        } else {
            let src = project_root.join("src");

-            let mut roots = if system.is_directory(&src) {
+            if system.is_directory(&src) {
                // Default to `src` and the project root if `src` exists and the root hasn't been specified.
                // This corresponds to the `src-layout`
                tracing::debug!(
@@ -141,24 +154,7 @@ impl Options {
                // Default to a [flat project structure](https://packaging.python.org/en/latest/discussions/src-layout-vs-flat-layout/).
                tracing::debug!("Defaulting `src.root` to `.`");
                vec![project_root.to_path_buf()]
-            };
-
-            // Considering pytest test discovery conventions,
-            // we also include the `tests` directory if it exists and is not a package.
-            let tests_dir = project_root.join("tests");
-            if system.is_directory(&tests_dir)
-                && !system.is_file(&tests_dir.join("__init__.py"))
-                && !roots.contains(&tests_dir)
-            {
-                // If the `tests` directory exists and is not a package, include it as a source root.
-                tracing::debug!(
-                    "Including `./tests` in `src.root` because a `./tests` directory exists"
-                );
-
-                roots.push(tests_dir);
            }
-
-            roots
        };

        let (extra_paths, python, typeshed) = self
@@ -190,11 +186,6 @@ impl Options {
                        .ok()
                        .map(PythonPath::from_virtual_env_var)
                })
-                .or_else(|| {
-                    std::env::var("CONDA_PREFIX")
-                        .ok()
-                        .map(PythonPath::from_conda_prefix_var)
-                })
                .unwrap_or_else(|| PythonPath::Discover(project_root.to_path_buf())),
        }
    }
@@ -203,7 +194,7 @@ impl Options {
    pub(crate) fn to_settings(&self, db: &dyn Db) -> (Settings, Vec<OptionDiagnostic>) {
        let (rules, diagnostics) = self.to_rule_selection(db);

-        let mut settings = Settings::new(rules, self.src.as_ref());
+        let mut settings = Settings::new(rules, self.respect_ignore_files);

        if let Some(terminal) = self.terminal.as_ref() {
            settings.set_terminal(TerminalSettings {
@@ -396,9 +387,6 @@ pub struct SrcOptions {
    /// * if a `./src` directory exists, include `.` and `./src` in the first party search path (src layout or flat)
    /// * if a `./<project-name>/<project-name>` directory exists, include `.` and `./<project-name>` in the first party search path
    /// * otherwise, default to `.` (flat layout)
-    ///
-    /// Besides, if a `./tests` directory exists and is not a package (i.e. it does not contain an `__init__.py` file),
-    /// it will also be included in the first party search path.
    #[serde(skip_serializing_if = "Option::is_none")]
    #[option(
        default = r#"null"#,
@@ -408,19 +396,6 @@ pub struct SrcOptions {
        "#
    )]
    pub root: Option<RelativePathBuf>,
-
-    /// Whether to automatically exclude files that are ignored by `.ignore`,
-    /// `.gitignore`, `.git/info/exclude`, and global `gitignore` files.
-    /// Enabled by default.
-    #[option(
-        default = r#"true"#,
-        value_type = r#"bool"#,
-        example = r#"
-            respect-ignore-files = false
-        "#
-    )]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub respect_ignore_files: Option<bool>,
 }

 #[derive(Debug, Default, Clone, Eq, PartialEq, Combine, Serialize, Deserialize)]
@@ -575,20 +550,3 @@ impl OptionDiagnostic {
        }
    }
 }
-
-/// This is a wrapper for options that actually get loaded from configuration files
-/// and the CLI, which also includes a `config_file_override` option that overrides
-/// default configuration discovery with an explicitly-provided path to a configuration file
-pub struct ProjectOptionsOverrides {
-    pub config_file_override: Option<SystemPathBuf>,
-    pub options: Options,
-}
-
-impl ProjectOptionsOverrides {
-    pub fn new(config_file_override: Option<SystemPathBuf>, options: Options) -> Self {
-        Self {
-            config_file_override,
-            options,
-        }
-    }
-}
--- a/crates/ty_project/src/metadata/settings.rs
+++ b/crates/ty_project/src/metadata/settings.rs
@@ -1,6 +1,5 @@
 use std::sync::Arc;

-use crate::metadata::options::SrcOptions;
 use ruff_db::diagnostic::DiagnosticFormat;
 use ty_python_semantic::lint::RuleSelection;

@@ -27,15 +26,11 @@ pub struct Settings {
 }

 impl Settings {
-    pub fn new(rules: RuleSelection, src_options: Option<&SrcOptions>) -> Self {
-        let respect_ignore_files = src_options
-            .and_then(|src| src.respect_ignore_files)
-            .unwrap_or(true);
-
+    pub fn new(rules: RuleSelection, respect_ignore_files: Option<bool>) -> Self {
        Self {
            rules: Arc::new(rules),
            terminal: TerminalSettings::default(),
-            respect_ignore_files,
+            respect_ignore_files: respect_ignore_files.unwrap_or(true),
        }
    }

--- a/crates/ty_python_semantic/resources/mdtest/annotations/callable.md
+++ b/crates/ty_python_semantic/resources/mdtest/annotations/callable.md
@@ -305,37 +305,4 @@ def _(c: Callable[[int], int]):
    reveal_type(c.__call__)  # revealed: (int, /) -> int
 ```

-Unlike other type checkers, we do _not_ allow attributes to be accessed that would only be available
-on function-like callables:
-
-```py
-def f_wrong(c: Callable[[], None]):
-    # error: [unresolved-attribute] "Type `() -> None` has no attribute `__qualname__`"
-    c.__qualname__
-
-    # error: [unresolved-attribute] "Unresolved attribute `__qualname__` on type `() -> None`."
-    c.__qualname__ = "my_callable"
-```
-
-We do this, because at runtime, calls to `f_wrong` with a non-function callable would raise an
-`AttributeError`:
-
-```py
-class MyCallable:
-    def __call__(self) -> None:
-        pass
-
-f_wrong(MyCallable())  # raises `AttributeError` at runtime
-```
-
-If users want to write to attributes such as `__qualname__`, they need to check the existence of the
-attribute first:
-
-```py
-def f_okay(c: Callable[[], None]):
-    if hasattr(c, "__qualname__"):
-        c.__qualname__  # okay
-        c.__qualname__ = "my_callable"  # also okay
-```
-
 [gradual form]: https://typing.python.org/en/latest/spec/glossary.html#term-gradual-form
--- a/crates/ty_python_semantic/resources/mdtest/attributes.md
+++ b/crates/ty_python_semantic/resources/mdtest/attributes.md
@@ -1527,65 +1527,6 @@ def _(ns: argparse.Namespace):
    reveal_type(ns.whatever)  # revealed: Any
 ```

-## Classes with custom `__getattribute__` methods
-
-If a type provides a custom `__getattribute__`, we use its return type as the type for unknown
-attributes. Note that this behavior differs from runtime, where `__getattribute__` is called
-unconditionally, even for known attributes. The rationale for doing this is that it allows users to
-specify more precise types for specific attributes, such as `x: str` in the example below. This
-behavior matches other type checkers such as mypy and pyright.
-
-```py
-from typing import Any
-
-class Foo:
-    x: str
-    def __getattribute__(self, attr: str) -> Any:
-        return 42
-
-reveal_type(Foo().x)  # revealed: str
-reveal_type(Foo().y)  # revealed: Any
-```
-
-A standard library example for a class with a custom `__getattribute__` method is `SimpleNamespace`:
-
-```py
-from types import SimpleNamespace
-
-sn = SimpleNamespace(a="a")
-
-reveal_type(sn.a)  # revealed: Any
-```
-
-`__getattribute__` takes precedence over `__getattr__`:
-
-```py
-class C:
-    def __getattribute__(self, name: str) -> int:
-        return 1
-
-    def __getattr__(self, name: str) -> str:
-        return "a"
-
-c = C()
-
-reveal_type(c.x)  # revealed: int
-```
-
-Like all dunder methods, `__getattribute__` is not looked up on instances:
-
-```py
-def external_getattribute(name) -> int:
-    return 1
-
-class ThisFails:
-    def __init__(self):
-        self.__getattribute__ = external_getattribute
-
-# error: [unresolved-attribute]
-ThisFails().x
-```
-
 ## Classes with custom `__setattr__` methods

 ### Basic
@@ -1757,36 +1698,6 @@ reveal_type(outer.nested.inner.Outer.Nested.Inner.attr)  # revealed: int
 outer.nested.inner.Outer.Nested.Inner.attr = "a"
 ```

-### Unions of module attributes
-
-`mod1.py`:
-
-```py
-global_symbol: str = "a"
-```
-
-`mod2.py`:
-
-```py
-global_symbol: str = "a"
-```
-
-```py
-import mod1
-import mod2
-
-def _(flag: bool):
-    if flag:
-        mod = mod1
-    else:
-        mod = mod2
-
-    mod.global_symbol = "b"
-
-    # error: [invalid-assignment] "Object of type `Literal[1]` is not assignable to attribute `global_symbol` on type `<module 'mod1'> | <module 'mod2'>`"
-    mod.global_symbol = 1
-```
-
 ## Literal types

 ### Function-literal attributes
--- a/crates/ty_python_semantic/resources/mdtest/call/dunder.md
+++ b/crates/ty_python_semantic/resources/mdtest/call/dunder.md
@@ -59,8 +59,6 @@ ClassWithNormalDunder[0]

 ## Operating on instances

-### Attaching dunder methods to instances in methods
-
 When invoking a dunder method on an instance of a class, it is looked up on the class:

 ```py
@@ -118,40 +116,6 @@ def _(flag: bool):
    reveal_type(this_fails[0])  # revealed: Unknown | str
 ```

-### Dunder methods as class-level annotations with no value
-
-Class-level annotations with no value assigned are considered instance-only, and aren't available as
-dunder methods:
-
-```py
-from typing import Callable
-
-class C:
-    __call__: Callable[..., None]
-
-# error: [call-non-callable]
-C()()
-
-# error: [invalid-assignment]
-_: Callable[..., None] = C()
-```
-
-And of course the same is true if we have only an implicit assignment inside a method:
-
-```py
-from typing import Callable
-
-class C:
-    def __init__(self):
-        self.__call__ = lambda *a, **kw: None
-
-# error: [call-non-callable]
-C()()
-
-# error: [invalid-assignment]
-_: Callable[..., None] = C()
-```
-
 ## When the dunder is not a method

 A dunder can also be a non-method callable:
@@ -275,3 +239,37 @@ def _(flag: bool):
    # error: [possibly-unbound-implicit-call]
    reveal_type(c[0])  # revealed: str
 ```
+
+## Dunder methods cannot be looked up on instances
+
+Class-level annotations with no value assigned are considered instance-only, and aren't available as
+dunder methods:
+
+```py
+from typing import Callable
+
+class C:
+    __call__: Callable[..., None]
+
+# error: [call-non-callable]
+C()()
+
+# error: [invalid-assignment]
+_: Callable[..., None] = C()
+```
+
+And of course the same is true if we have only an implicit assignment inside a method:
+
+```py
+from typing import Callable
+
+class C:
+    def __init__(self):
+        self.__call__ = lambda *a, **kw: None
+
+# error: [call-non-callable]
+C()()
+
+# error: [invalid-assignment]
+_: Callable[..., None] = C()
+```
--- a/crates/ty_python_semantic/resources/mdtest/generics/legacy/classes.md
+++ b/crates/ty_python_semantic/resources/mdtest/generics/legacy/classes.md
@@ -37,7 +37,7 @@ class RepeatedTypevar(Generic[T, T]): ...
 You can only specialize `typing.Generic` with typevars (TODO: or param specs or typevar tuples).

 ```py
-# error: [invalid-argument-type] "`<class 'int'>` is not a valid argument to `Generic`"
+# error: [invalid-argument-type] "`<class 'int'>` is not a valid argument to `typing.Generic`"
 class GenericOfType(Generic[int]): ...
 ```

--- a/crates/ty_python_semantic/resources/mdtest/generics/pep695/classes.md
+++ b/crates/ty_python_semantic/resources/mdtest/generics/pep695/classes.md
@@ -67,41 +67,6 @@ T = TypeVar("T")

 # error: [invalid-generic-class] "Cannot both inherit from `typing.Generic` and use PEP 695 type variables"
 class BothGenericSyntaxes[U](Generic[T]): ...
-
-reveal_type(BothGenericSyntaxes.__mro__)  # revealed: tuple[<class 'BothGenericSyntaxes[Unknown]'>, Unknown, <class 'object'>]
-
-# error: [invalid-generic-class] "Cannot both inherit from `typing.Generic` and use PEP 695 type variables"
-# error: [invalid-base] "Cannot inherit from plain `Generic`"
-class DoublyInvalid[T](Generic): ...
-
-reveal_type(DoublyInvalid.__mro__)  # revealed: tuple[<class 'DoublyInvalid[Unknown]'>, Unknown, <class 'object'>]
-```
-
-Generic classes implicitly inherit from `Generic`:
-
-```py
-class Foo[T]: ...
-
-# revealed: tuple[<class 'Foo[Unknown]'>, typing.Generic, <class 'object'>]
-reveal_type(Foo.__mro__)
-# revealed: tuple[<class 'Foo[int]'>, typing.Generic, <class 'object'>]
-reveal_type(Foo[int].__mro__)
-
-class A: ...
-class Bar[T](A): ...
-
-# revealed: tuple[<class 'Bar[Unknown]'>, <class 'A'>, typing.Generic, <class 'object'>]
-reveal_type(Bar.__mro__)
-# revealed: tuple[<class 'Bar[int]'>, <class 'A'>, typing.Generic, <class 'object'>]
-reveal_type(Bar[int].__mro__)
-
-class B: ...
-class Baz[T](A, B): ...
-
-# revealed: tuple[<class 'Baz[Unknown]'>, <class 'A'>, <class 'B'>, typing.Generic, <class 'object'>]
-reveal_type(Baz.__mro__)
-# revealed: tuple[<class 'Baz[int]'>, <class 'A'>, <class 'B'>, typing.Generic, <class 'object'>]
-reveal_type(Baz[int].__mro__)
 ```

 ## Specializing generic classes explicitly
--- a/crates/ty_python_semantic/resources/mdtest/mro.md
+++ b/crates/ty_python_semantic/resources/mdtest/mro.md
@@ -644,14 +644,14 @@ reveal_type(C.__mro__)  # revealed: tuple[<class 'C'>, Unknown, <class 'object'>

 class D(D.a):
    a: D
-reveal_type(D.__class__)  # revealed: <class 'type'>
+#reveal_type(D.__class__)  # revealed: <class 'type'>
 reveal_type(D.__mro__)  # revealed: tuple[<class 'D'>, Unknown, <class 'object'>]

 class E[T](E.a): ...
-reveal_type(E.__class__)  # revealed: <class 'type'>
-reveal_type(E.__mro__)  # revealed: tuple[<class 'E[Unknown]'>, Unknown, typing.Generic, <class 'object'>]
+#reveal_type(E.__class__)  # revealed: <class 'type'>
+reveal_type(E.__mro__)  # revealed: tuple[<class 'E[Unknown]'>, Unknown, <class 'object'>]

 class F[T](F(), F): ...  # error: [cyclic-class-definition]
-reveal_type(F.__class__)  # revealed: type[Unknown]
+#reveal_type(F.__class__)  # revealed: <class 'type'>
 reveal_type(F.__mro__)  # revealed: tuple[<class 'F[Unknown]'>, Unknown, <class 'object'>]
 ```
--- a/crates/ty_python_semantic/resources/mdtest/protocols.md
+++ b/crates/ty_python_semantic/resources/mdtest/protocols.md
@@ -58,13 +58,9 @@ class Bar1(Protocol[T], Generic[T]):
 class Bar2[T](Protocol):
    x: T

-# error: [invalid-generic-class] "Cannot both inherit from subscripted `Protocol` and use PEP 695 type variables"
+# error: [invalid-generic-class] "Cannot both inherit from subscripted `typing.Protocol` and use PEP 695 type variables"
 class Bar3[T](Protocol[T]):
    x: T
-
-# Note that this class definition *will* actually succeed at runtime,
-# unlike classes that combine PEP-695 type parameters with inheritance from `Generic[]`
-reveal_type(Bar3.__mro__)  # revealed: tuple[<class 'Bar3[Unknown]'>, typing.Protocol, typing.Generic, <class 'object'>]
 ```

 It's an error to include both bare `Protocol` and subscripted `Protocol[]` in the bases list
@@ -379,7 +375,8 @@ class Foo(Protocol):
    def method_member(self) -> bytes:
        return b"foo"

-reveal_type(get_protocol_members(Foo))  # revealed: frozenset[Literal["method_member", "x", "y", "z"]]
+# TODO: actually a frozenset (requires support for legacy generics)
+reveal_type(get_protocol_members(Foo))  # revealed: tuple[Literal["method_member"], Literal["x"], Literal["y"], Literal["z"]]
 ```

 Certain special attributes and methods are not considered protocol members at runtime, and should
@@ -397,7 +394,8 @@ class Lumberjack(Protocol):
    def __init__(self, x: int) -> None:
        self.x = x

-reveal_type(get_protocol_members(Lumberjack))  # revealed: frozenset[Literal["x"]]
+# TODO: actually a frozenset
+reveal_type(get_protocol_members(Lumberjack))  # revealed: tuple[Literal["x"]]
 ```

 A sub-protocol inherits and extends the members of its superclass protocol(s):
@@ -409,11 +407,13 @@ class Bar(Protocol):
 class Baz(Bar, Protocol):
    ham: memoryview

-reveal_type(get_protocol_members(Baz))  # revealed: frozenset[Literal["ham", "spam"]]
+# TODO: actually a frozenset
+reveal_type(get_protocol_members(Baz))  # revealed: tuple[Literal["ham"], Literal["spam"]]

 class Baz2(Bar, Foo, Protocol): ...

-# revealed: frozenset[Literal["method_member", "spam", "x", "y", "z"]]
+# TODO: actually a frozenset
+# revealed: tuple[Literal["method_member"], Literal["spam"], Literal["x"], Literal["y"], Literal["z"]]
 reveal_type(get_protocol_members(Baz2))
 ```

@@ -441,7 +441,8 @@ class Foo(Protocol):
        e = 56
        def f(self) -> None: ...

-reveal_type(get_protocol_members(Foo))  # revealed: frozenset[Literal["d", "e", "f"]]
+# TODO: actually a frozenset
+reveal_type(get_protocol_members(Foo))  # revealed: tuple[Literal["d"], Literal["e"], Literal["f"]]
 ```

 ## Invalid calls to `get_protocol_members()`
@@ -672,7 +673,8 @@ class LotsOfBindings(Protocol):
        case l:  # TODO: this should error with `[invalid-protocol]` (`l` is not declared)
            ...

-# revealed: frozenset[Literal["Nested", "NestedProtocol", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l"]]
+# TODO: actually a frozenset
+# revealed: tuple[Literal["Nested"], Literal["NestedProtocol"], Literal["a"], Literal["b"], Literal["c"], Literal["d"], Literal["e"], Literal["f"], Literal["g"], Literal["h"], Literal["i"], Literal["j"], Literal["k"], Literal["l"]]
 reveal_type(get_protocol_members(LotsOfBindings))
 ```

@@ -700,7 +702,9 @@ class Foo(Protocol):

 # Note: the list of members does not include `a`, `b` or `c`,
 # as none of these attributes is declared in the class body.
-reveal_type(get_protocol_members(Foo))  # revealed: frozenset[Literal["non_init_method", "x", "y"]]
+#
+# TODO: actually a frozenset
+reveal_type(get_protocol_members(Foo))  # revealed: tuple[Literal["non_init_method"], Literal["x"], Literal["y"]]
 ```

 If a member is declared in a superclass of a protocol class, it is fine for it to be assigned to in
@@ -713,8 +717,9 @@ class Super(Protocol):
 class Sub(Super, Protocol):
    x = 42  # no error here, since it's declared in the superclass

-reveal_type(get_protocol_members(Super))  # revealed: frozenset[Literal["x"]]
-reveal_type(get_protocol_members(Sub))  # revealed: frozenset[Literal["x"]]
+# TODO: actually frozensets
+reveal_type(get_protocol_members(Super))  # revealed: tuple[Literal["x"]]
+reveal_type(get_protocol_members(Sub))  # revealed: tuple[Literal["x"]]
 ```

 If a protocol has 0 members, then all other types are assignable to it, and all fully static types
--- a/crates/ty_python_semantic/resources/mdtest/snapshots/sync.md_-_With_statements_-_Accidental_use_of_no…_(b07503f9b773ea61).snap
+++ b/crates/ty_python_semantic/resources/mdtest/snapshots/sync.md_-_With_statements_-_Accidental_use_of_no…_(b07503f9b773ea61).snap
@@ -1,85 +0,0 @@
---
-source: crates/ty_test/src/lib.rs
-expression: snapshot
---
---
-mdtest name: sync.md - With statements - Accidental use of non-async `with`
-mdtest path: crates/ty_python_semantic/resources/mdtest/with/sync.md
---
-
-# Python source files
-
-## mdtest_snippet.py
-
-```
- 1 | class Manager:
- 2 |     async def __aenter__(self): ...
- 3 |     async def __aexit__(self, *args): ...
- 4 | 
- 5 | # error: [invalid-context-manager] "Object of type `Manager` cannot be used with `with` because it does not implement `__enter__` and `__exit__`"
- 6 | with Manager():
- 7 |     ...
- 8 | class Manager:
- 9 |     async def __aenter__(self): ...
-10 |     async def __aexit__(self, typ: str, exc, traceback): ...
-11 | 
-12 | # error: [invalid-context-manager] "Object of type `Manager` cannot be used with `with` because it does not implement `__enter__` and `__exit__`"
-13 | with Manager():
-14 |     ...
-15 | class Manager:
-16 |     async def __aenter__(self, wrong_extra_arg): ...
-17 |     async def __aexit__(self, typ, exc, traceback, wrong_extra_arg): ...
-18 | 
-19 | # error: [invalid-context-manager] "Object of type `Manager` cannot be used with `with` because it does not implement `__enter__` and `__exit__`"
-20 | with Manager():
-21 |     ...
-```
-
-# Diagnostics
-
-```
-error[invalid-context-manager]: Object of type `Manager` cannot be used with `with` because it does not implement `__enter__` and `__exit__`
- --> src/mdtest_snippet.py:6:6
-  |
-5 | # error: [invalid-context-manager] "Object of type `Manager` cannot be used with `with` because it does not implement `__enter__` and...
-6 | with Manager():
-  |      ^^^^^^^^^
-7 |     ...
-8 | class Manager:
-  |
-info: Objects of type `Manager` can be used as async context managers
-info: Consider using `async with` here
-info: rule `invalid-context-manager` is enabled by default
-
-```
-
-```
-error[invalid-context-manager]: Object of type `Manager` cannot be used with `with` because it does not implement `__enter__` and `__exit__`
-  --> src/mdtest_snippet.py:13:6
-   |
-12 | # error: [invalid-context-manager] "Object of type `Manager` cannot be used with `with` because it does not implement `__enter__` an...
-13 | with Manager():
-   |      ^^^^^^^^^
-14 |     ...
-15 | class Manager:
-   |
-info: Objects of type `Manager` can be used as async context managers
-info: Consider using `async with` here
-info: rule `invalid-context-manager` is enabled by default
-
-```
-
-```
-error[invalid-context-manager]: Object of type `Manager` cannot be used with `with` because it does not implement `__enter__` and `__exit__`
-  --> src/mdtest_snippet.py:20:6
-   |
-19 | # error: [invalid-context-manager] "Object of type `Manager` cannot be used with `with` because it does not implement `__enter__` an...
-20 | with Manager():
-   |      ^^^^^^^^^
-21 |     ...
-   |
-info: Objects of type `Manager` can be used as async context managers
-info: Consider using `async with` here
-info: rule `invalid-context-manager` is enabled by default
-
-```
--- a/crates/ty_python_semantic/resources/mdtest/with/sync.md
+++ b/crates/ty_python_semantic/resources/mdtest/with/sync.md
@@ -149,45 +149,3 @@ context_expr = Manager()
 with context_expr as f:
    reveal_type(f)  # revealed: str
 ```
-
-## Accidental use of non-async `with`
-
-<!-- snapshot-diagnostics -->
-
-If a synchronous `with` statement is used on a type with `__aenter__` and `__aexit__`, we show a
-diagnostic hint that the user might have intended to use `asnyc with` instead.
-
-```py
-class Manager:
-    async def __aenter__(self): ...
-    async def __aexit__(self, *args): ...
-
-# error: [invalid-context-manager] "Object of type `Manager` cannot be used with `with` because it does not implement `__enter__` and `__exit__`"
-with Manager():
-    ...
-```
-
-The sub-diagnostic is also provided if the signatures of `__aenter__` and `__aexit__` do not match
-the expected signatures for a context manager:
-
-```py
-class Manager:
-    async def __aenter__(self): ...
-    async def __aexit__(self, typ: str, exc, traceback): ...
-
-# error: [invalid-context-manager] "Object of type `Manager` cannot be used with `with` because it does not implement `__enter__` and `__exit__`"
-with Manager():
-    ...
-```
-
-Similarly, we also show the hint if the functions have the wrong number of arguments:
-
-```py
-class Manager:
-    async def __aenter__(self, wrong_extra_arg): ...
-    async def __aexit__(self, typ, exc, traceback, wrong_extra_arg): ...
-
-# error: [invalid-context-manager] "Object of type `Manager` cannot be used with `with` because it does not implement `__enter__` and `__exit__`"
-with Manager():
-    ...
-```
--- a/crates/ty_python_semantic/resources/primer/bad.txt
+++ b/crates/ty_python_semantic/resources/primer/bad.txt
@@ -1,7 +1,6 @@
 Tanjun  # hangs
 antidote  # hangs / slow
 artigraph  # cycle panics (value_type_)
-arviz  # too many iterations on versions of arviz newer than https://github.com/arviz-devs/arviz/commit/3205b82bb4d6097c31f7334d7ac51a6de37002d0
 core  # cycle panics (value_type_)
 cpython  # access to field whilst being initialized, too many cycle iterations
 discord.py  # some kind of hang, only when multi-threaded?
--- a/crates/ty_python_semantic/resources/primer/good.txt
+++ b/crates/ty_python_semantic/resources/primer/good.txt
@@ -12,6 +12,7 @@ alerta
 altair
 anyio
 apprise
+arviz
 async-utils
 asynq
 attrs
--- a/Show More
+++ b/Show More