Invert case

Lint
[ty] Cache Type::is_disjoint_from
2025-12-20 22:31:37 -06:00 · 2025-12-20 22:31:37 -06:00 · 2025-12-20 22:31:37 -06:00 · 2025-12-20 22:31:37 -06:00 · 2025-12-20 22:31:37 -06:00
1080 changed files with 4785 additions and 8861 deletions
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -1,67 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(cargo build:*)",
-      "Read(//home/micha/astral/discord.py/discord/**)",
-      "Bash(source:*)",
-      "Bash(./target/profiling/ty check:*)",
-      "Bash(tee:*)",
-      "Read(//home/micha/astral/discord.py/.venv/**)",
-      "Read(//home/micha/astral/discord.py/**)",
-      "Bash(perf record:*)",
-      "Bash(perf report:*)",
-      "Bash(time:*)",
-      "Bash(../ruff/target/profiling/ty check discord/audit_logs.py -vv)",
-      "Bash(sed:*)",
-      "Read(//home/micha/git/TypeScript/**)",
-      "Bash(cargo test:*)",
-      "Bash(MDTEST_TEST_FILTER='union_types.md - Union types - Unions of tuples' cargo test -p ty_python_semantic --test mdtest -- mdtest__union_types)",
-      "Bash(timeout 10 cargo test --package ty_python_semantic --lib types::tests::divergent_type)",
-      "Bash(timeout 30 cargo test:*)",
-      "Bash(git stash:*)",
-      "Bash(timeout 60 time:*)",
-      "Bash(for i in 1 2 3 4 5)",
-      "Bash(do echo \"Run $i:\")",
-      "Bash(done)",
-      "Bash(for i in 1 2 3)",
-      "Bash(cargo fuzz run:*)",
-      "Bash(timeout 60 cargo fuzz run -s none ty_check_invalid_syntax -- -timeout=1)",
-      "Bash(for:*)",
-      "Bash(do echo \"=== Checking $crash ===\")",
-      "Bash(uvx ty@latest check \"$crash\")",
-      "Bash(do echo \"=== $crash ===\")",
-      "Bash(while read crash)",
-      "Bash(cargo fuzz cmin:*)",
-      "Bash(cargo +nightly fuzz cmin:*)",
-      "Bash(timeout 120 cargo fuzz run -s none ty_check_invalid_syntax -- -timeout=1)",
-      "Bash(awk:*)",
-      "Bash(while read file)",
-      "Bash(cat:*)",
-      "Bash(uvx ty@latest:*)",
-      "Bash(do cp \"$crash\" /tmp/isolated_crash.py)",
-      "Bash(echo \"=== $crash ===\")",
-      "Bash(do echo \"=== test$i.py ===\")",
-      "Bash(do echo \"=== Testing $crash ===\")",
-      "Bash(tree:*)",
-      "Bash(cut:*)",
-      "Bash(grep:*)",
-      "Bash(ls:*)",
-      "Bash(xargs basename:*)",
-      "Bash(wc:*)",
-      "Bash(find:*)",
-      "Bash({} ;)",
-      "Bash(git checkout:*)",
-      "Bash(do)",
-      "Bash(if ! grep -q \"use crate::types\" \"$f\")",
-      "Bash(! grep -q \"crate::types::\" \"$f\")",
-      "Bash(then)",
-      "Bash(else)",
-      "Bash(fi)",
-      "Bash(1)",
-      "Bash(__NEW_LINE__ echo \"Done\")",
-      "Bash(rm:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -4,12 +4,10 @@
 self-hosted-runner:
  # Various runners we use that aren't recognized out-of-the-box by actionlint:
  labels:
-    - depot-ubuntu-24.04-4
    - depot-ubuntu-latest-8
    - depot-ubuntu-22.04-16
    - depot-ubuntu-22.04-32
    - depot-windows-2022-16
-    - depot-ubuntu-22.04-arm-4
    - github-windows-2025-x86_64-8
    - github-windows-2025-x86_64-16
    - codspeed-macro
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -952,7 +952,7 @@ jobs:
          tool: cargo-codspeed

      - name: "Build benchmarks"
-        run: cargo codspeed build --features "codspeed,ruff_instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench formatter --bench lexer --bench linter --bench parser
+        run: cargo codspeed build --features "codspeed,instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench formatter --bench lexer --bench linter --bench parser

      - name: "Run benchmarks"
        uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
@@ -960,9 +960,9 @@ jobs:
          mode: simulation
          run: cargo codspeed run

-  benchmarks-instrumented-ty-build:
-    name: "benchmarks instrumented ty (build)"
-    runs-on: depot-ubuntu-24.04-4
+  benchmarks-instrumented-ty:
+    name: "benchmarks instrumented (ty)"
+    runs-on: ubuntu-24.04
    needs: determine_changes
    if: |
      github.repository == 'astral-sh/ruff' &&
@@ -971,6 +971,9 @@ jobs:
        needs.determine_changes.outputs.ty == 'true'
      )
    timeout-minutes: 20
+    permissions:
+      contents: read # required for actions/checkout
+      id-token: write # required for OIDC authentication with CodSpeed
    steps:
      - name: "Checkout Branch"
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -980,6 +983,7 @@ jobs:
      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
+      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4

      - name: "Install Rust toolchain"
        run: rustup show
@@ -990,64 +994,28 @@ jobs:
          tool: cargo-codspeed

      - name: "Build benchmarks"
-        run: cargo codspeed build -m instrumentation --features "codspeed,ty_instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench ty
-
-      - name: "Upload benchmark binary"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: benchmarks-instrumented-ty-binary
-          path: target/codspeed/simulation/ruff_benchmark
-          retention-days: 1
-
-  benchmarks-instrumented-ty-run:
-    name: "benchmarks instrumented ty (${{ matrix.benchmark }})"
-    runs-on: ubuntu-24.04
-    needs: benchmarks-instrumented-ty-build
-    timeout-minutes: 20
-    permissions:
-      contents: read # required for actions/checkout
-      id-token: write # required for OIDC authentication with CodSpeed
-    strategy:
-      fail-fast: false
-      matrix:
-        benchmark:
-          - "check_file|micro|anyio"
-          - "attrs|hydra|datetype"
-    steps:
-      - name: "Checkout Branch"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          persist-credentials: false
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-
-      - name: "Install codspeed"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
-        with:
-          tool: cargo-codspeed
-
-      - name: "Download benchmark binary"
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v4.3.0
-        with:
-          name: benchmarks-instrumented-ty-binary
-          path: target/codspeed/simulation/ruff_benchmark
-
-      - name: "Restore binary permissions"
-        run: chmod +x target/codspeed/simulation/ruff_benchmark/ty
+        run: cargo codspeed build --features "codspeed,instrumented" --profile profiling --no-default-features -p ruff_benchmark --bench ty

      - name: "Run benchmarks"
        uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
        with:
          mode: simulation
-          run: cargo codspeed run --bench ty "${{ matrix.benchmark }}"
+          run: cargo codspeed run

-  benchmarks-walltime-build:
-    name: "benchmarks walltime (build)"
-    # We only run this job if `github.repository == 'astral-sh/ruff'`,
-    # so hardcoding depot here is fine
-    runs-on: depot-ubuntu-22.04-arm-4
+  benchmarks-walltime:
+    name: "benchmarks walltime (${{ matrix.benchmarks }})"
+    runs-on: codspeed-macro
    needs: determine_changes
    if: ${{ github.repository == 'astral-sh/ruff' && !contains(github.event.pull_request.labels.*.name, 'no-test') && (needs.determine_changes.outputs.ty == 'true' || github.ref == 'refs/heads/main') }}
    timeout-minutes: 20
+    permissions:
+      contents: read # required for actions/checkout
+      id-token: write # required for OIDC authentication with CodSpeed
+    strategy:
+      matrix:
+        benchmarks:
+          - "medium|multithreaded"
+          - "small|large"
    steps:
      - name: "Checkout Branch"
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -1068,51 +1036,7 @@ jobs:
          tool: cargo-codspeed

      - name: "Build benchmarks"
-        run: cargo codspeed build -m walltime --features "codspeed,ty_walltime" --profile profiling --no-default-features -p ruff_benchmark
-
-      - name: "Upload benchmark binary"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: benchmarks-walltime-binary
-          path: target/codspeed/walltime/ruff_benchmark
-          retention-days: 1
-
-  benchmarks-walltime-run:
-    name: "benchmarks walltime (${{ matrix.benchmark }})"
-    runs-on: codspeed-macro
-    needs: benchmarks-walltime-build
-    timeout-minutes: 20
-    permissions:
-      contents: read # required for actions/checkout
-      id-token: write # required for OIDC authentication with CodSpeed
-    strategy:
-      matrix:
-        benchmark:
-          - colour_science
-          - "pandas|tanjun|altair"
-          - "static_frame|sympy"
-          - "pydantic|multithreaded|freqtrade"
-    steps:
-      - name: "Checkout Branch"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          persist-credentials: false
-
-      - uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
-
-      - name: "Install codspeed"
-        uses: taiki-e/install-action@3575e532701a5fc614b0c842e4119af4cc5fd16d # v2.62.60
-        with:
-          tool: cargo-codspeed
-
-      - name: "Download benchmark binary"
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
-        with:
-          name: benchmarks-walltime-binary
-          path: target/codspeed/walltime/ruff_benchmark
-
-      - name: "Restore binary permissions"
-        run: chmod +x target/codspeed/walltime/ruff_benchmark/ty_walltime
+        run: cargo codspeed build --features "codspeed,walltime" --profile profiling --no-default-features -p ruff_benchmark

      - name: "Run benchmarks"
        uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad # v4.4.1
@@ -1123,4 +1047,4 @@ jobs:
          CODSPEED_PERF_ENABLED: false
        with:
          mode: walltime
-          run: cargo codspeed run --bench ty_walltime -m walltime "${{ matrix.benchmark }}"
+          run: cargo codspeed run --bench ty_walltime "${{ matrix.benchmarks }}"
--- a/.github/workflows/ty-ecosystem-report.yaml
+++ b/.github/workflows/ty-ecosystem-report.yaml
@@ -14,6 +14,7 @@ env:
  CARGO_TERM_COLOR: always
  RUSTUP_MAX_RETRIES: 10
  RUST_BACKTRACE: 1
+  CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}

 jobs:
  ty-ecosystem-report:
@@ -30,12 +31,12 @@ jobs:
      - name: Install the latest version of uv
        uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
        with:
-          enable-cache: true
+          enable-cache: true # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact

      - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
        with:
          workspaces: "ruff"
-          lookup-only: false
+          lookup-only: false # zizmor: ignore[cache-poisoning] acceptable risk for CloudFlare pages artifact

      - name: Install Rust toolchain
        run: rustup show
@@ -69,10 +70,11 @@ jobs:
            ecosystem-diagnostics.json \
            --output dist/index.html

-      # NOTE: astral-sh-bot uses this artifact to publish the ecosystem report.
-      # Make sure to update the bot if you rename the artifact.
-      - name: "Upload ecosystem report"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+      - name: "Deploy to Cloudflare Pages"
+        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
+        id: deploy
+        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3.14.1
        with:
-          name: full-report
-          path: dist/
+          apiToken: ${{ secrets.CF_API_TOKEN }}
+          accountId: ${{ secrets.CF_ACCOUNT_ID }}
+          command: pages deploy dist --project-name=ty-ecosystem --branch main --commit-hash ${GITHUB_SHA}
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,7 +5,7 @@ exclude: |
    .github/workflows/release.yml|
    crates/ty_vendored/vendor/.*|
    crates/ty_project/resources/.*|
-    crates/ty_python_types/resources/corpus/.*|
+    crates/ty_python_semantic/resources/corpus/.*|
    crates/ty/docs/(configuration|rules|cli|environment).md|
    crates/ruff_benchmark/resources/.*|
    crates/ruff_linter/resources/.*|
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3083,7 +3083,6 @@ dependencies = [
 "ty",
 "ty_project",
 "ty_python_semantic",
- "ty_python_types",
 "ty_static",
 "url",
 ]
@@ -3130,9 +3129,7 @@ dependencies = [
 "salsa",
 "schemars",
 "serde",
- "ty_module_resolver",
 "ty_python_semantic",
- "ty_python_types",
 "zip",
 ]

@@ -3622,8 +3619,8 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"

 [[package]]
 name = "salsa"
-version = "0.25.2"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=ce80691fa0b87dc2fd2235a26544e63e5e43d8d3#ce80691fa0b87dc2fd2235a26544e63e5e43d8d3"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
 dependencies = [
 "boxcar",
 "compact_str",
@@ -3647,13 +3644,13 @@ dependencies = [

 [[package]]
 name = "salsa-macro-rules"
-version = "0.25.2"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=ce80691fa0b87dc2fd2235a26544e63e5e43d8d3#ce80691fa0b87dc2fd2235a26544e63e5e43d8d3"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"

 [[package]]
 name = "salsa-macros"
-version = "0.25.2"
-source = "git+https://github.com/salsa-rs/salsa.git?rev=ce80691fa0b87dc2fd2235a26544e63e5e43d8d3#ce80691fa0b87dc2fd2235a26544e63e5e43d8d3"
+version = "0.24.0"
+source = "git+https://github.com/salsa-rs/salsa.git?rev=55e5e7d32fa3fc189276f35bb04c9438f9aedbd1#55e5e7d32fa3fc189276f35bb04c9438f9aedbd1"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -4378,7 +4375,6 @@ dependencies = [
 "tracing-flame",
 "tracing-subscriber",
 "ty_combine",
- "ty_module_resolver",
 "ty_project",
 "ty_python_semantic",
 "ty_server",
@@ -4393,6 +4389,7 @@ dependencies = [
 "ordermap",
 "ruff_db",
 "ruff_python_ast",
+ "ty_python_semantic",
 ]

 [[package]]
@@ -4410,8 +4407,8 @@ dependencies = [
 "tempfile",
 "toml",
 "ty_ide",
- "ty_module_resolver",
 "ty_project",
+ "ty_python_semantic",
 "walkdir",
 ]

@@ -4441,33 +4438,8 @@ dependencies = [
 "salsa",
 "smallvec",
 "tracing",
- "ty_module_resolver",
 "ty_project",
 "ty_python_semantic",
- "ty_python_types",
- "ty_vendored",
-]
-
-[[package]]
-name = "ty_module_resolver"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "camino",
- "compact_str",
- "get-size2",
- "insta",
- "ruff_db",
- "ruff_memory_usage",
- "ruff_python_ast",
- "ruff_python_stdlib",
- "rustc-hash",
- "salsa",
- "strum",
- "strum_macros",
- "tempfile",
- "thiserror 2.0.17",
- "tracing",
 "ty_vendored",
 ]

@@ -4505,9 +4477,7 @@ dependencies = [
 "toml",
 "tracing",
 "ty_combine",
- "ty_module_resolver",
 "ty_python_semantic",
- "ty_python_types",
 "ty_static",
 "ty_vendored",
 ]
@@ -4521,12 +4491,19 @@ dependencies = [
 "bitvec",
 "camino",
 "colored 3.0.0",
+ "compact_str",
+ "datatest-stable",
+ "drop_bomb",
 "get-size2",
+ "glob",
 "hashbrown 0.16.1",
 "indexmap",
+ "indoc",
 "insta",
 "itertools 0.14.0",
+ "memchr",
 "ordermap",
+ "pretty_assertions",
 "quickcheck",
 "quickcheck_macros",
 "ruff_annotate_snippets",
@@ -4536,7 +4513,9 @@ dependencies = [
 "ruff_macros",
 "ruff_memory_usage",
 "ruff_python_ast",
+ "ruff_python_literal",
 "ruff_python_parser",
+ "ruff_python_stdlib",
 "ruff_python_trivia",
 "ruff_source_file",
 "ruff_text_size",
@@ -4550,57 +4529,10 @@ dependencies = [
 "strsim",
 "strum",
 "strum_macros",
+ "tempfile",
+ "test-case",
 "thiserror 2.0.17",
 "tracing",
- "ty_combine",
- "ty_module_resolver",
- "ty_static",
- "ty_vendored",
-]
-
-[[package]]
-name = "ty_python_types"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "bitflags 2.10.0",
- "camino",
- "compact_str",
- "datatest-stable",
- "drop_bomb",
- "get-size2",
- "glob",
- "indexmap",
- "indoc",
- "insta",
- "itertools 0.14.0",
- "memchr",
- "ordermap",
- "pretty_assertions",
- "quickcheck",
- "quickcheck_macros",
- "ruff_db",
- "ruff_diagnostics",
- "ruff_macros",
- "ruff_memory_usage",
- "ruff_python_ast",
- "ruff_python_literal",
- "ruff_python_parser",
- "ruff_python_stdlib",
- "ruff_source_file",
- "ruff_text_size",
- "rustc-hash",
- "salsa",
- "schemars",
- "serde",
- "serde_json",
- "smallvec",
- "static_assertions",
- "strum",
- "strum_macros",
- "test-case",
- "tracing",
- "ty_module_resolver",
 "ty_python_semantic",
 "ty_static",
 "ty_test",
@@ -4640,7 +4572,6 @@ dependencies = [
 "tracing-subscriber",
 "ty_combine",
 "ty_ide",
- "ty_module_resolver",
 "ty_project",
 "ty_python_semantic",
 ]
@@ -4681,9 +4612,7 @@ dependencies = [
 "thiserror 2.0.17",
 "toml",
 "tracing",
- "ty_module_resolver",
 "ty_python_semantic",
- "ty_python_types",
 "ty_static",
 "ty_vendored",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,10 +45,8 @@ ty = { path = "crates/ty" }
 ty_combine = { path = "crates/ty_combine" }
 ty_completion_eval = { path = "crates/ty_completion_eval" }
 ty_ide = { path = "crates/ty_ide" }
-ty_module_resolver = { path = "crates/ty_module_resolver" }
 ty_project = { path = "crates/ty_project", default-features = false }
 ty_python_semantic = { path = "crates/ty_python_semantic" }
-ty_python_types = { path = "crates/ty_python_types" }
 ty_server = { path = "crates/ty_server" }
 ty_static = { path = "crates/ty_static" }
 ty_test = { path = "crates/ty_test" }
@@ -148,7 +146,7 @@ regex-automata = { version = "0.4.9" }
 rustc-hash = { version = "2.0.0" }
 rustc-stable-hash = { version = "0.1.2" }
 # When updating salsa, make sure to also update the revision in `fuzz/Cargo.toml`
-salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "ce80691fa0b87dc2fd2235a26544e63e5e43d8d3", default-features = false, features = [
+salsa = { git = "https://github.com/salsa-rs/salsa.git", rev = "55e5e7d32fa3fc189276f35bb04c9438f9aedbd1", default-features = false, features = [
    "compact_str",
    "macros",
    "salsa_unstable",
--- a/crates/ruff/tests/cli/snapshots/cliformatoutput_format_github.snap
+++ b/crates/ruff/tests/cli/snapshots/cliformatoutput_format_github.snap
@@ -14,6 +14,6 @@ info:
 success: false
 exit_code: 1
 ----- stdout -----
-::error title=Ruff (unformatted),file=[TMP]/input.py,line=1,endLine=2::input.py:1:1: unformatted: File would be reformatted
+::error title=Ruff (unformatted),file=[TMP]/input.py,line=1,col=1,endLine=2,endColumn=1::input.py:1:1: unformatted: File would be reformatted

 ----- stderr -----
--- a/crates/ruff_benchmark/Cargo.toml
+++ b/crates/ruff_benchmark/Cargo.toml
@@ -19,32 +19,32 @@ doctest = false
 [[bench]]
 name = "linter"
 harness = false
-required-features = ["ruff_instrumented"]
+required-features = ["instrumented"]

 [[bench]]
 name = "lexer"
 harness = false
-required-features = ["ruff_instrumented"]
+required-features = ["instrumented"]

 [[bench]]
 name = "parser"
 harness = false
-required-features = ["ruff_instrumented"]
+required-features = ["instrumented"]

 [[bench]]
 name = "formatter"
 harness = false
-required-features = ["ruff_instrumented"]
+required-features = ["instrumented"]

 [[bench]]
 name = "ty"
 harness = false
-required-features = ["ty_instrumented"]
+required-features = ["instrumented"]

 [[bench]]
 name = "ty_walltime"
 harness = false
-required-features = ["ty_walltime"]
+required-features = ["walltime"]

 [dependencies]
 ruff_db = { workspace = true, features = ["testing"] }
@@ -67,32 +67,25 @@ tracing = { workspace = true }
 workspace = true

 [features]
-default = ["ty_instrumented", "ty_walltime", "ruff_instrumented"]
-# Enables the ruff instrumented benchmarks
-ruff_instrumented = [
+default = ["instrumented", "walltime"]
+# Enables the benchmark that should only run with codspeed's instrumented runner
+instrumented = [
    "criterion",
    "ruff_linter",
    "ruff_python_formatter",
    "ruff_python_parser",
    "ruff_python_trivia",
-    "mimalloc",
-    "tikv-jemallocator",
-]
-# Enables the ty instrumented benchmarks
-ty_instrumented = [
-    "criterion",
    "ty_project",
-    "ruff_python_trivia",
 ]
 codspeed = ["codspeed-criterion-compat"]
-# Enables the ty_walltime benchmarks
-ty_walltime = ["ruff_db/os", "ty_project", "divan"]
+# Enables benchmark that should only run with codspeed's walltime runner.
+walltime = ["ruff_db/os", "ty_project", "divan"]

-[target.'cfg(target_os = "windows")'.dependencies]
-mimalloc = { workspace = true, optional = true }
+[target.'cfg(target_os = "windows")'.dev-dependencies]
+mimalloc = { workspace = true }

-[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dependencies]
-tikv-jemallocator = { workspace = true, optional = true }
+[target.'cfg(all(not(target_os = "windows"), not(target_os = "openbsd"), any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "powerpc64", target_arch = "riscv64")))'.dev-dependencies]
+tikv-jemallocator = { workspace = true }

 [dev-dependencies]
 rustc-hash = { workspace = true }
--- a/crates/ruff_benchmark/benches/ty_walltime.rs
+++ b/crates/ruff_benchmark/benches/ty_walltime.rs
@@ -194,7 +194,7 @@ static SYMPY: Benchmark = Benchmark::new(
        max_dep_date: "2025-06-17",
        python_version: PythonVersion::PY312,
    },
-    13106,
+    13100,
 );

 static TANJUN: Benchmark = Benchmark::new(
@@ -235,55 +235,30 @@ fn run_single_threaded(bencher: Bencher, benchmark: &Benchmark) {
        });
 }

-#[bench(sample_size = 2, sample_count = 3)]
-fn altair(bencher: Bencher) {
-    run_single_threaded(bencher, &ALTAIR);
+#[bench(args=[&ALTAIR, &FREQTRADE, &TANJUN], sample_size=2, sample_count=3)]
+fn small(bencher: Bencher, benchmark: &Benchmark) {
+    run_single_threaded(bencher, benchmark);
 }

-#[bench(sample_size = 2, sample_count = 3)]
-fn freqtrade(bencher: Bencher) {
-    run_single_threaded(bencher, &FREQTRADE);
+#[bench(args=[&COLOUR_SCIENCE, &PANDAS, &STATIC_FRAME], sample_size=1, sample_count=3)]
+fn medium(bencher: Bencher, benchmark: &Benchmark) {
+    run_single_threaded(bencher, benchmark);
 }

-#[bench(sample_size = 2, sample_count = 3)]
-fn tanjun(bencher: Bencher) {
-    run_single_threaded(bencher, &TANJUN);
+#[bench(args=[&SYMPY, &PYDANTIC], sample_size=1, sample_count=2)]
+fn large(bencher: Bencher, benchmark: &Benchmark) {
+    run_single_threaded(bencher, benchmark);
 }

-#[bench(sample_size = 2, sample_count = 3)]
-fn pydantic(bencher: Bencher) {
-    run_single_threaded(bencher, &PYDANTIC);
-}
-
-#[bench(sample_size = 1, sample_count = 3)]
-fn static_frame(bencher: Bencher) {
-    run_single_threaded(bencher, &STATIC_FRAME);
-}
-
-#[bench(sample_size = 1, sample_count = 2)]
-fn colour_science(bencher: Bencher) {
-    run_single_threaded(bencher, &COLOUR_SCIENCE);
-}
-
-#[bench(sample_size = 1, sample_count = 2)]
-fn pandas(bencher: Bencher) {
-    run_single_threaded(bencher, &PANDAS);
-}
-
-#[bench(sample_size = 1, sample_count = 2)]
-fn sympy(bencher: Bencher) {
-    run_single_threaded(bencher, &SYMPY);
-}
-
-#[bench(sample_size = 3, sample_count = 8)]
-fn multithreaded(bencher: Bencher) {
+#[bench(args=[&ALTAIR], sample_size=3, sample_count=8)]
+fn multithreaded(bencher: Bencher, benchmark: &Benchmark) {
    let thread_pool = ThreadPoolBuilder::new().build().unwrap();

    bencher
-        .with_inputs(|| ALTAIR.setup_iteration())
+        .with_inputs(|| benchmark.setup_iteration())
        .bench_local_values(|db| {
            thread_pool.install(|| {
-                check_project(&db, ALTAIR.project.name, ALTAIR.max_diagnostics);
+                check_project(&db, benchmark.project.name, benchmark.max_diagnostics);
                db
            })
        });
--- a/crates/ruff_benchmark/src/lib.rs
+++ b/crates/ruff_benchmark/src/lib.rs
@@ -1,6 +1,6 @@
 use std::path::PathBuf;

-#[cfg(any(feature = "ty_instrumented", feature = "ruff_instrumented"))]
+#[cfg(feature = "instrumented")]
 pub mod criterion;
 pub mod real_world_projects;

--- a/crates/ruff_db/src/cancellation.rs
+++ b/crates/ruff_db/src/cancellation.rs
@@ -1,51 +0,0 @@
-use std::sync::Arc;
-use std::sync::atomic::AtomicBool;
-
-/// Signals a [`CancellationToken`] that it should be canceled.
-#[derive(Debug, Clone)]
-pub struct CancellationTokenSource {
-    cancelled: Arc<AtomicBool>,
-}
-
-impl Default for CancellationTokenSource {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl CancellationTokenSource {
-    pub fn new() -> Self {
-        Self {
-            cancelled: Arc::new(AtomicBool::new(false)),
-        }
-    }
-
-    pub fn is_cancellation_requested(&self) -> bool {
-        self.cancelled.load(std::sync::atomic::Ordering::Relaxed)
-    }
-
-    /// Creates a new token that uses this source.
-    pub fn token(&self) -> CancellationToken {
-        CancellationToken {
-            cancelled: self.cancelled.clone(),
-        }
-    }
-
-    /// Requests cancellation for operations using this token.
-    pub fn cancel(&self) {
-        self.cancelled
-            .store(true, std::sync::atomic::Ordering::Relaxed);
-    }
-}
-
-/// Token signals whether an operation should be canceled.
-#[derive(Debug, Clone)]
-pub struct CancellationToken {
-    cancelled: Arc<AtomicBool>,
-}
-
-impl CancellationToken {
-    pub fn is_cancelled(&self) -> bool {
-        self.cancelled.load(std::sync::atomic::Ordering::Relaxed)
-    }
-}
--- a/crates/ruff_db/src/diagnostic/mod.rs
+++ b/crates/ruff_db/src/diagnostic/mod.rs
@@ -1,4 +1,4 @@
-use std::{borrow::Cow, fmt::Formatter, path::Path, sync::Arc};
+use std::{fmt::Formatter, path::Path, sync::Arc};

 use ruff_diagnostics::{Applicability, Fix};
 use ruff_source_file::{LineColumn, SourceCode, SourceFile};
@@ -11,7 +11,6 @@ pub use self::render::{
    ceil_char_boundary,
    github::{DisplayGithubDiagnostics, GithubRenderer},
 };
-use crate::cancellation::CancellationToken;
 use crate::{Db, files::File};

 mod render;
@@ -411,6 +410,11 @@ impl Diagnostic {
        self.id().is_invalid_syntax()
    }

+    /// Returns the message body to display to the user.
+    pub fn body(&self) -> &str {
+        self.primary_message()
+    }
+
    /// Returns the message of the first sub-diagnostic with a `Help` severity.
    ///
    /// Note that this is used as the fix title/suggestion for some of Ruff's output formats, but in
@@ -1308,8 +1312,6 @@ pub struct DisplayDiagnosticConfig {
    show_fix_diff: bool,
    /// The lowest applicability that should be shown when reporting diagnostics.
    fix_applicability: Applicability,
-
-    cancellation_token: Option<CancellationToken>,
 }

 impl DisplayDiagnosticConfig {
@@ -1383,20 +1385,6 @@ impl DisplayDiagnosticConfig {
    pub fn fix_applicability(&self) -> Applicability {
        self.fix_applicability
    }
-
-    pub fn with_cancellation_token(
-        mut self,
-        token: Option<CancellationToken>,
-    ) -> DisplayDiagnosticConfig {
-        self.cancellation_token = token;
-        self
-    }
-
-    pub fn is_canceled(&self) -> bool {
-        self.cancellation_token
-            .as_ref()
-            .is_some_and(|token| token.is_cancelled())
-    }
 }

 impl Default for DisplayDiagnosticConfig {
@@ -1410,7 +1398,6 @@ impl Default for DisplayDiagnosticConfig {
            show_fix_status: false,
            show_fix_diff: false,
            fix_applicability: Applicability::Safe,
-            cancellation_token: None,
        }
    }
 }
@@ -1487,15 +1474,6 @@ pub enum ConciseMessage<'a> {
    Custom(&'a str),
 }

-impl<'a> ConciseMessage<'a> {
-    pub fn to_str(&self) -> Cow<'a, str> {
-        match self {
-            ConciseMessage::MainDiagnostic(s) | ConciseMessage::Custom(s) => Cow::Borrowed(s),
-            ConciseMessage::Both { .. } => Cow::Owned(self.to_string()),
-        }
-    }
-}
-
 impl std::fmt::Display for ConciseMessage<'_> {
    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
        match *self {
@@ -1512,16 +1490,6 @@ impl std::fmt::Display for ConciseMessage<'_> {
    }
 }

-#[cfg(feature = "serde")]
-impl serde::Serialize for ConciseMessage<'_> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        serializer.collect_str(self)
-    }
-}
-
 /// A diagnostic message string.
 ///
 /// This is, for all intents and purposes, equivalent to a `Box<str>`.
--- a/crates/ruff_db/src/diagnostic/render/azure.rs
+++ b/crates/ruff_db/src/diagnostic/render/azure.rs
@@ -52,7 +52,7 @@ impl AzureRenderer<'_> {
                f,
                "code={code};]{body}",
                code = diag.secondary_code_or_id(),
-                body = diag.concise_message(),
+                body = diag.body(),
            )?;
        }

--- a/crates/ruff_db/src/diagnostic/render/concise.rs
+++ b/crates/ruff_db/src/diagnostic/render/concise.rs
@@ -28,10 +28,6 @@ impl<'a> ConciseRenderer<'a> {

        let sep = fmt_styled(":", stylesheet.separator);
        for diag in diagnostics {
-            if self.config.is_canceled() {
-                return Ok(());
-            }
-
            if let Some(span) = diag.primary_span() {
                write!(
                    f,
--- a/crates/ruff_db/src/diagnostic/render/full.rs
+++ b/crates/ruff_db/src/diagnostic/render/full.rs
@@ -53,10 +53,6 @@ impl<'a> FullRenderer<'a> {
            .hyperlink(stylesheet.hyperlink);

        for diag in diagnostics {
-            if self.config.is_canceled() {
-                return Ok(());
-            }
-
            let resolved = Resolved::new(self.resolver, diag, self.config);
            let renderable = resolved.to_renderable(self.config.context);
            for diag in renderable.diagnostics.iter() {
--- a/crates/ruff_db/src/diagnostic/render/github.rs
+++ b/crates/ruff_db/src/diagnostic/render/github.rs
@@ -49,26 +49,14 @@ impl<'a> GithubRenderer<'a> {
                }
                .unwrap_or_default();

-                // GitHub Actions workflow commands have constraints on error annotations:
-                // - `col` and `endColumn` cannot be set if `line` and `endLine` are different
-                // See: https://github.com/astral-sh/ruff/issues/22074
-                if start_location.line == end_location.line {
-                    write!(
-                        f,
-                        ",line={row},col={column},endLine={end_row},endColumn={end_column}::",
-                        row = start_location.line,
-                        column = start_location.column,
-                        end_row = end_location.line,
-                        end_column = end_location.column,
-                    )?;
-                } else {
-                    write!(
-                        f,
-                        ",line={row},endLine={end_row}::",
-                        row = start_location.line,
-                        end_row = end_location.line,
-                    )?;
-                }
+                write!(
+                    f,
+                    ",line={row},col={column},endLine={end_row},endColumn={end_column}::",
+                    row = start_location.line,
+                    column = start_location.column,
+                    end_row = end_location.line,
+                    end_column = end_location.column,
+                )?;

                write!(
                    f,
@@ -87,7 +75,7 @@ impl<'a> GithubRenderer<'a> {
                write!(f, "{id}:", id = diagnostic.id())?;
            }

-            writeln!(f, " {}", diagnostic.concise_message())?;
+            writeln!(f, " {}", diagnostic.body())?;
        }

        Ok(())
--- a/crates/ruff_db/src/diagnostic/render/gitlab.rs
+++ b/crates/ruff_db/src/diagnostic/render/gitlab.rs
@@ -98,7 +98,7 @@ impl Serialize for SerializedMessages<'_> {
            }
            fingerprints.insert(message_fingerprint);

-            let description = diagnostic.concise_message();
+            let description = diagnostic.body();
            let check_name = diagnostic.secondary_code_or_id();
            let severity = match diagnostic.severity() {
                Severity::Info => "info",
--- a/crates/ruff_db/src/diagnostic/render/json.rs
+++ b/crates/ruff_db/src/diagnostic/render/json.rs
@@ -6,7 +6,7 @@ use ruff_notebook::NotebookIndex;
 use ruff_source_file::{LineColumn, OneIndexed};
 use ruff_text_size::Ranged;

-use crate::diagnostic::{ConciseMessage, Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};
+use crate::diagnostic::{Diagnostic, DiagnosticSource, DisplayDiagnosticConfig};

 use super::FileResolver;

@@ -101,7 +101,7 @@ pub(super) fn diagnostic_to_json<'a>(
        JsonDiagnostic {
            code: diagnostic.secondary_code_or_id(),
            url: diagnostic.documentation_url(),
-            message: diagnostic.concise_message(),
+            message: diagnostic.body(),
            fix,
            cell: notebook_cell_index,
            location: start_location.map(JsonLocation::from),
@@ -113,7 +113,7 @@ pub(super) fn diagnostic_to_json<'a>(
        JsonDiagnostic {
            code: diagnostic.secondary_code_or_id(),
            url: diagnostic.documentation_url(),
-            message: diagnostic.concise_message(),
+            message: diagnostic.body(),
            fix,
            cell: notebook_cell_index,
            location: Some(start_location.unwrap_or_default().into()),
@@ -226,7 +226,7 @@ pub(crate) struct JsonDiagnostic<'a> {
    filename: Option<&'a str>,
    fix: Option<JsonFix<'a>>,
    location: Option<JsonLocation>,
-    message: ConciseMessage<'a>,
+    message: &'a str,
    noqa_row: Option<OneIndexed>,
    url: Option<&'a str>,
 }
--- a/crates/ruff_db/src/diagnostic/render/junit.rs
+++ b/crates/ruff_db/src/diagnostic/render/junit.rs
@@ -56,17 +56,17 @@ impl<'a> JunitRenderer<'a> {
                        start_location: location,
                    } = diagnostic;
                    let mut status = TestCaseStatus::non_success(NonSuccessKind::Failure);
-                    status.set_message(diagnostic.concise_message().to_str());
+                    status.set_message(diagnostic.body());

                    if let Some(location) = location {
                        status.set_description(format!(
                            "line {row}, col {col}, {body}",
                            row = location.line,
                            col = location.column,
-                            body = diagnostic.concise_message()
+                            body = diagnostic.body()
                        ));
                    } else {
-                        status.set_description(diagnostic.concise_message().to_str());
+                        status.set_description(diagnostic.body());
                    }

                    let code = diagnostic
--- a/crates/ruff_db/src/diagnostic/render/pylint.rs
+++ b/crates/ruff_db/src/diagnostic/render/pylint.rs
@@ -55,7 +55,7 @@ impl PylintRenderer<'_> {
                f,
                "{path}:{row}: [{code}] {body}",
                path = filename,
-                body = diagnostic.concise_message()
+                body = diagnostic.body()
            )?;
        }

--- a/crates/ruff_db/src/diagnostic/render/rdjson.rs
+++ b/crates/ruff_db/src/diagnostic/render/rdjson.rs
@@ -5,7 +5,7 @@ use ruff_diagnostics::{Edit, Fix};
 use ruff_source_file::{LineColumn, SourceCode};
 use ruff_text_size::Ranged;

-use crate::diagnostic::{ConciseMessage, Diagnostic};
+use crate::diagnostic::Diagnostic;

 use super::FileResolver;

@@ -76,7 +76,7 @@ fn diagnostic_to_rdjson<'a>(
    let edits = diagnostic.fix().map(Fix::edits).unwrap_or_default();

    RdjsonDiagnostic {
-        message: diagnostic.concise_message(),
+        message: diagnostic.body(),
        location,
        code: RdjsonCode {
            value: diagnostic
@@ -155,7 +155,7 @@ struct RdjsonDiagnostic<'a> {
    code: RdjsonCode<'a>,
    #[serde(skip_serializing_if = "Option::is_none")]
    location: Option<RdjsonLocation<'a>>,
-    message: ConciseMessage<'a>,
+    message: &'a str,
    #[serde(skip_serializing_if = "Vec::is_empty")]
    suggestions: Vec<RdjsonSuggestion<'a>>,
 }
--- a/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergithubtests__syntax_errors.snap
+++ b/crates/ruff_db/src/diagnostic/render/snapshots/ruff_dbdiagnosticrendergithubtests__syntax_errors.snap
@@ -2,5 +2,5 @@
 source: crates/ruff_db/src/diagnostic/render/github.rs
 expression: env.render_diagnostics(&diagnostics)
 ---
-::error title=ty (invalid-syntax),file=/syntax_errors.py,line=1,endLine=2::syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
-::error title=ty (invalid-syntax),file=/syntax_errors.py,line=3,endLine=4::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
+::error title=ty (invalid-syntax),file=/syntax_errors.py,line=1,col=15,endLine=2,endColumn=1::syntax_errors.py:1:15: invalid-syntax: Expected one or more symbol names after import
+::error title=ty (invalid-syntax),file=/syntax_errors.py,line=3,col=12,endLine=4,endColumn=1::syntax_errors.py:3:12: invalid-syntax: Expected ')', found newline
--- a/crates/ruff_db/src/lib.rs
+++ b/crates/ruff_db/src/lib.rs
@@ -12,7 +12,6 @@ use std::hash::BuildHasherDefault;
 use std::num::NonZeroUsize;
 use ty_static::EnvVars;

-pub mod cancellation;
 pub mod diagnostic;
 pub mod display;
 pub mod file_revision;
--- a/crates/ruff_db/src/system/os.rs
+++ b/crates/ruff_db/src/system/os.rs
@@ -275,16 +275,16 @@ impl OsSystem {
    /// instead of at least one system call for each component between `path` and `prefix`.
    ///
    /// However, using `canonicalize` to resolve the path's casing doesn't work in two cases:
-    /// * if `path` is a symlink, `canonicalize` returns the symlink's target and not the symlink's source path.
-    /// * on Windows: If `path` is a mapped network drive, `canonicalize` returns the UNC path
-    ///   (e.g. `Z:\` is mapped to `\\server\share` and `canonicalize` returns `\\?\UNC\server\share`).
+    /// * if `path` is a symlink because `canonicalize` then returns the symlink's target and not the symlink's source path.
+    /// * on Windows: If `path` is a mapped network drive because `canonicalize` then returns the UNC path
+    ///   (e.g. `Z:\` is mapped to `\\server\share` and `canonicalize` then returns `\\?\UNC\server\share`).
    ///
    /// Symlinks and mapped network drives should be rare enough that this fast path is worth trying first,
    /// even if it comes at a cost for those rare use cases.
    fn path_exists_case_sensitive_fast(&self, path: &SystemPath) -> Option<bool> {
        // This is a more forgiving version of `dunce::simplified` that removes all `\\?\` prefixes on Windows.
        // We use this more forgiving version because we don't intend on using either path for anything other than comparison
-        // and the prefix is only relevant when passing the path to other programs and it's longer than 200 something
+        // and the prefix is only relevant when passing the path to other programs and its longer than 200 something
        // characters.
        fn simplify_ignore_verbatim(path: &SystemPath) -> &SystemPath {
            if cfg!(windows) {
@@ -298,7 +298,9 @@ impl OsSystem {
            }
        }

-        let Ok(canonicalized) = path.as_std_path().canonicalize() else {
+        let simplified = simplify_ignore_verbatim(path);
+
+        let Ok(canonicalized) = simplified.as_std_path().canonicalize() else {
            // The path doesn't exist or can't be accessed. The path doesn't exist.
            return Some(false);
        };
@@ -307,13 +309,12 @@ impl OsSystem {
            // The original path is valid UTF8 but the canonicalized path isn't. This definitely suggests
            // that a symlink is involved. Fall back to the slow path.
            tracing::debug!(
-                "Falling back to the slow case-sensitive path existence check because the canonicalized path of `{path}` is not valid UTF-8"
+                "Falling back to the slow case-sensitive path existence check because the canonicalized path of `{simplified}` is not valid UTF-8"
            );
            return None;
        };

        let simplified_canonicalized = simplify_ignore_verbatim(&canonicalized);
-        let simplified = simplify_ignore_verbatim(path);

        // Test if the paths differ by anything other than casing. If so, that suggests that
        // `path` pointed to a symlink (or some other none reversible path normalization happened).
--- a/crates/ruff_dev/Cargo.toml
+++ b/crates/ruff_dev/Cargo.toml
@@ -14,7 +14,6 @@ license = { workspace = true }
 ty = { workspace = true }
 ty_project = { workspace = true, features = ["schemars"] }
 ty_python_semantic = { workspace = true }
-ty_python_types = { workspace = true }
 ty_static = { workspace = true }
 ruff = { workspace = true }
 ruff_formatter = { workspace = true }
--- a/crates/ruff_dev/src/generate_ty_options.rs
+++ b/crates/ruff_dev/src/generate_ty_options.rs
@@ -1,13 +1,11 @@
 //! Generate a Markdown-compatible listing of configuration options for `pyproject.toml`.

-use std::borrow::Cow;
-use std::{fmt::Write, path::PathBuf};
-
 use anyhow::bail;
 use itertools::Itertools;
 use pretty_assertions::StrComparison;
+use std::{fmt::Write, path::PathBuf};
+
 use ruff_options_metadata::{OptionField, OptionSet, OptionsMetadata, Visit};
-use ruff_python_trivia::textwrap;
 use ty_project::metadata::Options;

 use crate::{
@@ -167,69 +165,62 @@ fn emit_field(output: &mut String, name: &str, field: &OptionField, parents: &[S
    let _ = writeln!(output, "**Default value**: `{}`", field.default);
    output.push('\n');
    let _ = writeln!(output, "**Type**: `{}`", field.value_type);
-
    output.push('\n');
    output.push_str("**Example usage**:\n\n");
+    output.push_str(&format_example(
+        "pyproject.toml",
+        &format_header(
+            field.scope,
+            field.example,
+            parents,
+            ConfigurationFile::PyprojectToml,
+        ),
+        field.example,
+    ));
+    output.push('\n');
+}

-    for configuration_file in [ConfigurationFile::PyprojectToml, ConfigurationFile::TyToml] {
-        let (header, example) =
-            format_snippet(field.scope, field.example, parents, configuration_file);
-        output.push_str(&format_tab(configuration_file.name(), &header, &example));
-
-        output.push('\n');
+fn format_example(title: &str, header: &str, content: &str) -> String {
+    if header.is_empty() {
+        format!("```toml title=\"{title}\"\n{content}\n```\n",)
+    } else {
+        format!("```toml title=\"{title}\"\n{header}\n{content}\n```\n",)
    }
 }

-fn format_tab(tab_name: &str, header: &str, content: &str) -> String {
-    let header = if header.is_empty() {
-        String::new()
-    } else {
-        format!("\n    {header}")
-    };
-    format!(
-        "=== \"{}\"\n\n    ```toml{}\n{}\n    ```\n",
-        tab_name,
-        header,
-        textwrap::indent(content, "    ")
-    )
-}
 /// Format the TOML header for the example usage for a given option.
 ///
-/// For example: `[tool.ty.rules]`.
-fn format_snippet<'a>(
+/// For example: `[tool.ruff.format]` or `[tool.ruff.lint.isort]`.
+fn format_header(
    scope: Option<&str>,
-    example: &'a str,
+    example: &str,
    parents: &[Set],
    configuration: ConfigurationFile,
-) -> (String, Cow<'a, str>) {
-    let mut example = Cow::Borrowed(example);
+) -> String {
+    let tool_parent = match configuration {
+        ConfigurationFile::PyprojectToml => Some("tool.ty"),
+        ConfigurationFile::TyToml => None,
+    };

-    let header = configuration
-        .parent_table()
+    let header = tool_parent
        .into_iter()
        .chain(parents.iter().filter_map(|parent| parent.name()))
        .chain(scope)
        .join(".");

-    // Rewrite examples starting with `[tool.ty]` or `[[tool.ty]]` to their `ty.toml` equivalent.
-    if matches!(configuration, ConfigurationFile::TyToml) {
-        example = example.replace("[tool.ty.", "[").into();
-    }
-
    // Ex) `[[tool.ty.xx]]`
    if example.starts_with(&format!("[[{header}")) {
-        return (String::new(), example);
+        return String::new();
    }
-
    // Ex) `[tool.ty.rules]`
    if example.starts_with(&format!("[{header}")) {
-        return (String::new(), example);
+        return String::new();
    }

    if header.is_empty() {
-        (String::new(), example)
+        String::new()
    } else {
-        (format!("[{header}]"), example)
+        format!("[{header}]")
    }
 }

@@ -252,25 +243,10 @@ impl Visit for CollectOptionsVisitor {
 #[derive(Debug, Copy, Clone)]
 enum ConfigurationFile {
    PyprojectToml,
+    #[expect(dead_code)]
    TyToml,
 }

-impl ConfigurationFile {
-    const fn name(self) -> &'static str {
-        match self {
-            Self::PyprojectToml => "pyproject.toml",
-            Self::TyToml => "ty.toml",
-        }
-    }
-
-    const fn parent_table(self) -> Option<&'static str> {
-        match self {
-            Self::PyprojectToml => Some("tool.ty"),
-            Self::TyToml => None,
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use anyhow::Result;
--- a/crates/ruff_dev/src/generate_ty_rules.rs
+++ b/crates/ruff_dev/src/generate_ty_rules.rs
@@ -52,7 +52,7 @@ pub(crate) fn main(args: &Args) -> Result<()> {
 }

 fn generate_markdown() -> String {
-    let registry = ty_python_types::default_lint_registry();
+    let registry = ty_python_semantic::default_lint_registry();

    let mut output = String::new();

--- a/crates/ruff_graph/Cargo.toml
+++ b/crates/ruff_graph/Cargo.toml
@@ -16,9 +16,7 @@ ruff_linter = { workspace = true }
 ruff_macros = { workspace = true }
 ruff_python_ast = { workspace = true }
 ruff_python_parser = { workspace = true }
-ty_module_resolver = { workspace = true }
 ty_python_semantic = { workspace = true }
-ty_python_types = { workspace = true }

 anyhow = { workspace = true }
 clap = { workspace = true, optional = true }
--- a/crates/ruff_graph/src/collector.rs
+++ b/crates/ruff_graph/src/collector.rs
@@ -3,7 +3,7 @@ use ruff_python_ast::visitor::source_order::{
    SourceOrderVisitor, walk_expr, walk_module, walk_stmt,
 };
 use ruff_python_ast::{self as ast, Expr, Mod, Stmt};
-use ty_module_resolver::ModuleName;
+use ty_python_semantic::ModuleName;

 /// Collect all imports for a given Python file.
 #[derive(Default, Debug)]
--- a/crates/ruff_graph/src/db.rs
+++ b/crates/ruff_graph/src/db.rs
@@ -7,13 +7,11 @@ use ruff_db::files::{File, Files};
 use ruff_db::system::{OsSystem, System, SystemPathBuf};
 use ruff_db::vendored::{VendoredFileSystem, VendoredFileSystemBuilder};
 use ruff_python_ast::PythonVersion;
-use ty_module_resolver::{SearchPathSettings, SearchPaths};
 use ty_python_semantic::lint::{LintRegistry, RuleSelection};
 use ty_python_semantic::{
-    AnalysisSettings, Db, Program, ProgramSettings, PythonEnvironment, PythonPlatform,
-    PythonVersionSource, PythonVersionWithSource, SysPrefixPathOrigin,
+    Db, Program, ProgramSettings, PythonEnvironment, PythonPlatform, PythonVersionSource,
+    PythonVersionWithSource, SearchPathSettings, SysPrefixPathOrigin, default_lint_registry,
 };
-use ty_python_types::default_lint_registry;

 static EMPTY_VENDORED: std::sync::LazyLock<VendoredFileSystem> = std::sync::LazyLock::new(|| {
    let mut builder = VendoredFileSystemBuilder::new(CompressionMethod::Stored);
@@ -28,7 +26,6 @@ pub struct ModuleDb {
    files: Files,
    system: OsSystem,
    rule_selection: Arc<RuleSelection>,
-    analysis_settings: Arc<AnalysisSettings>,
 }

 impl ModuleDb {
@@ -88,13 +85,6 @@ impl SourceDb for ModuleDb {
    }
 }

-#[salsa::db]
-impl ty_module_resolver::Db for ModuleDb {
-    fn search_paths(&self) -> &SearchPaths {
-        Program::get(self).search_paths(self)
-    }
-}
-
 #[salsa::db]
 impl Db for ModuleDb {
    fn should_check_file(&self, file: File) -> bool {
@@ -112,10 +102,6 @@ impl Db for ModuleDb {
    fn verbose(&self) -> bool {
        false
    }
-
-    fn analysis_settings(&self) -> &AnalysisSettings {
-        &self.analysis_settings
-    }
 }

 #[salsa::db]
--- a/crates/ruff_graph/src/resolver.rs
+++ b/crates/ruff_graph/src/resolver.rs
@@ -1,6 +1,6 @@
 use ruff_db::files::{File, FilePath, system_path_to_file};
 use ruff_db::system::SystemPath;
-use ty_module_resolver::{
+use ty_python_semantic::{
    ModuleName, resolve_module, resolve_module_confident, resolve_real_module,
    resolve_real_module_confident,
 };
--- a/crates/ruff_linter/src/message/grouped.rs
+++ b/crates/ruff_linter/src/message/grouped.rs
@@ -197,7 +197,7 @@ impl Display for RuleCodeAndBody<'_> {
                        f,
                        "{fix}{body}",
                        fix = format_args!("[{}] ", "*".cyan()),
-                        body = self.message.concise_message(),
+                        body = self.message.body(),
                    );
                }
            }
@@ -208,14 +208,14 @@ impl Display for RuleCodeAndBody<'_> {
                f,
                "{code} {body}",
                code = code.red().bold(),
-                body = self.message.concise_message(),
+                body = self.message.body(),
            )
        } else {
            write!(
                f,
                "{code}: {body}",
                code = self.message.id().as_str().red().bold(),
-                body = self.message.concise_message(),
+                body = self.message.body(),
            )
        }
    }
--- a/crates/ruff_linter/src/message/sarif.rs
+++ b/crates/ruff_linter/src/message/sarif.rs
@@ -334,7 +334,7 @@ impl<'a> SarifResult<'a> {
            rule_id: RuleCode::from(diagnostic),
            level: "error".to_string(),
            message: SarifMessage {
-                text: diagnostic.concise_message().to_string(),
+                text: diagnostic.body().to_string(),
            },
            fixes: Self::fix(diagnostic, &uri).into_iter().collect(),
            locations: vec![SarifLocation {
--- a/crates/ruff_server/src/lint.rs
+++ b/crates/ruff_server/src/lint.rs
@@ -243,7 +243,7 @@ fn to_lsp_diagnostic(
 ) -> (usize, lsp_types::Diagnostic) {
    let diagnostic_range = diagnostic.range().unwrap_or_default();
    let name = diagnostic.name();
-    let body = diagnostic.concise_message().to_string();
+    let body = diagnostic.body().to_string();
    let fix = diagnostic.fix();
    let suggestion = diagnostic.first_help_text();
    let code = diagnostic.secondary_code();
--- a/crates/ruff_wasm/src/lib.rs
+++ b/crates/ruff_wasm/src/lib.rs
@@ -241,7 +241,7 @@ impl Workspace {
                let range = msg.range().unwrap_or_default();
                ExpandedMessage {
                    code: msg.secondary_code_or_id().to_string(),
-                    message: msg.concise_message().to_string(),
+                    message: msg.body().to_string(),
                    start_location: source_code
                        .source_location(range.start(), self.position_encoding)
                        .into(),
--- a/crates/ty/Cargo.toml
+++ b/crates/ty/Cargo.toml
@@ -42,7 +42,6 @@ wild = { workspace = true }
 [dev-dependencies]
 ruff_db = { workspace = true, features = ["testing"] }
 ruff_python_trivia = { workspace = true }
-ty_module_resolver = { workspace = true }

 dunce = { workspace = true }
 insta = { workspace = true, features = ["filters"] }
--- a/crates/ty/docs/configuration.md
+++ b/crates/ty/docs/configuration.md
@@ -20,59 +20,11 @@ Valid severities are:

 **Example usage**:

-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.rules]
-    possibly-unresolved-reference = "warn"
-    division-by-zero = "ignore"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [rules]
-    possibly-unresolved-reference = "warn"
-    division-by-zero = "ignore"
-    ```
-
---
-
-## `analysis`
-
-### `respect-type-ignore-comments`
-
-Whether ty should respect `type: ignore` comments.
-
-When set to `false`, `type: ignore` comments are treated like any other normal
-comment and can't be used to suppress ty errors (you have to use `ty: ignore` instead).
-
-Setting this option can be useful when using ty alongside other type checkers or when
-you prefer using `ty: ignore` over `type: ignore`.
-
-Defaults to `true`.
-
-**Default value**: `true`
-
-**Type**: `bool`
-
-**Example usage**:
-
-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.analysis]
-    # Disable support for `type: ignore` comments
-    respect-type-ignore-comments = false
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [analysis]
-    # Disable support for `type: ignore` comments
-    respect-type-ignore-comments = false
-    ```
+```toml title="pyproject.toml"
+[tool.ty.rules]
+possibly-unresolved-reference = "warn"
+division-by-zero = "ignore"
+```

 ---

@@ -95,19 +47,10 @@ configuration setting.

 **Example usage**:

-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.environment]
-    extra-paths = ["./shared/my-search-path"]
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [environment]
-    extra-paths = ["./shared/my-search-path"]
-    ```
+```toml title="pyproject.toml"
+[tool.ty.environment]
+extra-paths = ["./shared/my-search-path"]
+```

 ---

@@ -135,19 +78,10 @@ This option can be used to point to virtual or system Python environments.

 **Example usage**:

-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.environment]
-    python = "./custom-venv-location/.venv"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [environment]
-    python = "./custom-venv-location/.venv"
-    ```
+```toml title="pyproject.toml"
+[tool.ty.environment]
+python = "./custom-venv-location/.venv"
+```

 ---

@@ -171,21 +105,11 @@ If no platform is specified, ty will use the current platform:

 **Example usage**:

-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.environment]
-    # Tailor type stubs and conditionalized type definitions to windows.
-    python-platform = "win32"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [environment]
-    # Tailor type stubs and conditionalized type definitions to windows.
-    python-platform = "win32"
-    ```
+```toml title="pyproject.toml"
+[tool.ty.environment]
+# Tailor type stubs and conditionalized type definitions to windows.
+python-platform = "win32"
+```

 ---

@@ -215,19 +139,10 @@ to reflect the differing contents of the standard library across Python versions

 **Example usage**:

-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.environment]
-    python-version = "3.12"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [environment]
-    python-version = "3.12"
-    ```
+```toml title="pyproject.toml"
+[tool.ty.environment]
+python-version = "3.12"
+```

 ---

@@ -252,21 +167,11 @@ it will also be included in the first party search path.

 **Example usage**:

-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.environment]
-    # Multiple directories (priority order)
-    root = ["./src", "./lib", "./vendor"]
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [environment]
-    # Multiple directories (priority order)
-    root = ["./src", "./lib", "./vendor"]
-    ```
+```toml title="pyproject.toml"
+[tool.ty.environment]
+# Multiple directories (priority order)
+root = ["./src", "./lib", "./vendor"]
+```

 ---

@@ -282,19 +187,10 @@ bundled as a zip file in the binary

 **Example usage**:

-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.environment]
-    typeshed = "/path/to/custom/typeshed"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [environment]
-    typeshed = "/path/to/custom/typeshed"
-    ```
+```toml title="pyproject.toml"
+[tool.ty.environment]
+typeshed = "/path/to/custom/typeshed"
+```

 ---

@@ -344,29 +240,15 @@ If not specified, defaults to `[]` (excludes no files).

 **Example usage**:

-=== "pyproject.toml"
-
-    ```toml
-    [[tool.ty.overrides]]
-    exclude = [
-        "generated",
-        "*.proto",
-        "tests/fixtures/**",
-        "!tests/fixtures/important.py"  # Include this one file
-    ]
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [[overrides]]
-    exclude = [
-        "generated",
-        "*.proto",
-        "tests/fixtures/**",
-        "!tests/fixtures/important.py"  # Include this one file
-    ]
-    ```
+```toml title="pyproject.toml"
+[[tool.ty.overrides]]
+exclude = [
+    "generated",
+    "*.proto",
+    "tests/fixtures/**",
+    "!tests/fixtures/important.py"  # Include this one file
+]
+```

 ---

@@ -386,25 +268,13 @@ If not specified, defaults to `["**"]` (matches all files).

 **Example usage**:

-=== "pyproject.toml"
-
-    ```toml
-    [[tool.ty.overrides]]
-    include = [
-        "src",
-        "tests",
-    ]
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [[overrides]]
-    include = [
-        "src",
-        "tests",
-    ]
-    ```
+```toml title="pyproject.toml"
+[[tool.ty.overrides]]
+include = [
+    "src",
+    "tests",
+]
+```

 ---

@@ -422,25 +292,13 @@ severity levels or disable them entirely.

 **Example usage**:

-=== "pyproject.toml"
+```toml title="pyproject.toml"
+[[tool.ty.overrides]]
+include = ["src"]

-    ```toml
-    [[tool.ty.overrides]]
-    include = ["src"]
-
-    [tool.ty.overrides.rules]
-    possibly-unresolved-reference = "ignore"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [[overrides]]
-    include = ["src"]
-
-    [overrides.rules]
-    possibly-unresolved-reference = "ignore"
-    ```
+[tool.ty.overrides.rules]
+possibly-unresolved-reference = "ignore"
+```

 ---

@@ -500,29 +358,15 @@ to re-include `dist` use `exclude = ["!dist"]`

 **Example usage**:

-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.src]
-    exclude = [
-        "generated",
-        "*.proto",
-        "tests/fixtures/**",
-        "!tests/fixtures/important.py"  # Include this one file
-    ]
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [src]
-    exclude = [
-        "generated",
-        "*.proto",
-        "tests/fixtures/**",
-        "!tests/fixtures/important.py"  # Include this one file
-    ]
-    ```
+```toml title="pyproject.toml"
+[tool.ty.src]
+exclude = [
+    "generated",
+    "*.proto",
+    "tests/fixtures/**",
+    "!tests/fixtures/important.py"  # Include this one file
+]
+```

 ---

@@ -555,25 +399,13 @@ matches `<project_root>/src` and not `<project_root>/test/src`).

 **Example usage**:

-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.src]
-    include = [
-        "src",
-        "tests",
-    ]
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [src]
-    include = [
-        "src",
-        "tests",
-    ]
-    ```
+```toml title="pyproject.toml"
+[tool.ty.src]
+include = [
+    "src",
+    "tests",
+]
+```

 ---

@@ -589,19 +421,10 @@ Enabled by default.

 **Example usage**:

-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.src]
-    respect-ignore-files = false
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [src]
-    respect-ignore-files = false
-    ```
+```toml title="pyproject.toml"
+[tool.ty.src]
+respect-ignore-files = false
+```

 ---

@@ -627,19 +450,10 @@ it will also be included in the first party search path.

 **Example usage**:

-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.src]
-    root = "./app"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [src]
-    root = "./app"
-    ```
+```toml title="pyproject.toml"
+[tool.ty.src]
+root = "./app"
+```

 ---

@@ -657,21 +471,11 @@ Defaults to `false`.

 **Example usage**:

-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.terminal]
-    # Error if ty emits any warning-level diagnostics.
-    error-on-warning = true
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [terminal]
-    # Error if ty emits any warning-level diagnostics.
-    error-on-warning = true
-    ```
+```toml title="pyproject.toml"
+[tool.ty.terminal]
+# Error if ty emits any warning-level diagnostics.
+error-on-warning = true
+```

 ---

@@ -687,19 +491,10 @@ Defaults to `full`.

 **Example usage**:

-=== "pyproject.toml"
-
-    ```toml
-    [tool.ty.terminal]
-    output-format = "concise"
-    ```
-
-=== "ty.toml"
-
-    ```toml
-    [terminal]
-    output-format = "concise"
-    ```
+```toml title="pyproject.toml"
+[tool.ty.terminal]
+output-format = "concise"
+```

 ---

--- a/crates/ty/docs/rules.md
+++ b/crates/ty/docs/rules.md
@@ -8,7 +8,7 @@
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.20">0.0.1-alpha.20</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20ambiguous-protocol-member" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L538" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L511" target="_blank">View source</a>
 </small>


@@ -49,7 +49,7 @@ class SubProto(BaseProto, Protocol):
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20byte-string-type-annotation" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fstring_annotation.rs#L36" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L36" target="_blank">View source</a>
 </small>


@@ -80,7 +80,7 @@ def test(): -> "int":
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20call-non-callable" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L137" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L135" target="_blank">View source</a>
 </small>


@@ -98,44 +98,13 @@ Calling a non-callable object will raise a `TypeError` at runtime.
 4()  # TypeError: 'int' object is not callable
 ```

-## `call-top-callable`
-
-<small>
-Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
-Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.7">0.0.7</a> ·
-<a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20call-top-callable" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L155" target="_blank">View source</a>
-</small>
-
-
-**What it does**
-
-Checks for calls to objects typed as `Top[Callable[..., T]]` (the infinite union of all
-callable types with return type `T`).
-
-**Why is this bad?**
-
-When an object is narrowed to `Top[Callable[..., object]]` (e.g., via `callable(x)` or
-`isinstance(x, Callable)`), we know the object is callable, but we don't know its
-precise signature. This type represents the set of all possible callable types
-(including, e.g., functions that take no arguments and functions that require arguments),
-so no specific set of arguments can be guaranteed to be valid.
-
-**Examples**
-
-```python
-def f(x: object):
-    if callable(x):
-        x()  # error: We know `x` is callable, but not what arguments it accepts
-```
-
 ## `conflicting-argument-forms`

 <small>
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-argument-forms" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L206" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L179" target="_blank">View source</a>
 </small>


@@ -167,7 +136,7 @@ f(int)  # error
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-declarations" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L232" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L205" target="_blank">View source</a>
 </small>


@@ -198,7 +167,7 @@ a = 1
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20conflicting-metaclass" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L257" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L230" target="_blank">View source</a>
 </small>


@@ -230,7 +199,7 @@ class C(A, B): ...
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20cyclic-class-definition" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L283" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L256" target="_blank">View source</a>
 </small>


@@ -262,7 +231,7 @@ class B(A): ...
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Preview (since <a href="https://github.com/astral-sh/ty/releases/tag/1.0.0">1.0.0</a>) ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20cyclic-type-alias-definition" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L309" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L282" target="_blank">View source</a>
 </small>


@@ -290,7 +259,7 @@ type B = A
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.16">0.0.1-alpha.16</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20deprecated" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L353" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L326" target="_blank">View source</a>
 </small>


@@ -317,7 +286,7 @@ old_func()  # emits [deprecated] diagnostic
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'ignore'."><code>ignore</code></a> ·
 Preview (since <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a>) ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20division-by-zero" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L331" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L304" target="_blank">View source</a>
 </small>


@@ -346,7 +315,7 @@ false positives it can produce.
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20duplicate-base" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L374" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L347" target="_blank">View source</a>
 </small>


@@ -373,7 +342,7 @@ class B(A, A): ...
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.12">0.0.1-alpha.12</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20duplicate-kw-only" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L395" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L368" target="_blank">View source</a>
 </small>


@@ -411,24 +380,11 @@ class A:  # Crash at runtime
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20escape-character-in-forward-annotation" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fstring_annotation.rs#L154" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L120" target="_blank">View source</a>
 </small>


-**What it does**
-
-Checks for forward annotations that contain escape characters.
-
-**Why is this bad?**
-
-Static analysis tools like ty can't analyze type annotations that contain escape characters.
-
-**Example**
-
-
-```python
-def foo() -> "intt\b": ...
-```
+TODO #14889

 ## `fstring-type-annotation`

@@ -436,7 +392,7 @@ def foo() -> "intt\b": ...
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20fstring-type-annotation" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fstring_annotation.rs#L11" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L11" target="_blank">View source</a>
 </small>


@@ -467,7 +423,7 @@ def test(): -> "int":
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20ignore-comment-unknown-rule" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L49" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L47" target="_blank">View source</a>
 </small>


@@ -498,7 +454,7 @@ a = 20 / 0  # ty: ignore[division-by-zero]
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20implicit-concatenated-string-type-annotation" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fstring_annotation.rs#L86" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L86" target="_blank">View source</a>
 </small>


@@ -529,7 +485,7 @@ def test(): -> "Literal[5]":
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20inconsistent-mro" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L621" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L594" target="_blank">View source</a>
 </small>


@@ -559,7 +515,7 @@ class C(A, B): ...
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20index-out-of-bounds" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L645" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L618" target="_blank">View source</a>
 </small>


@@ -585,7 +541,7 @@ t[3]  # IndexError: tuple index out of range
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.12">0.0.1-alpha.12</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20instance-layout-conflict" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L427" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L400" target="_blank">View source</a>
 </small>


@@ -674,7 +630,7 @@ an atypical memory layout.
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-argument-type" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L699" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L672" target="_blank">View source</a>
 </small>


@@ -701,7 +657,7 @@ func("foo")  # error: [invalid-argument-type]
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-assignment" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L739" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L712" target="_blank">View source</a>
 </small>


@@ -729,7 +685,7 @@ a: int = ''
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-attribute-access" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2042" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2015" target="_blank">View source</a>
 </small>


@@ -763,7 +719,7 @@ C.instance_var = 3  # error: Cannot assign to instance variable
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.19">0.0.1-alpha.19</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-await" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L761" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L734" target="_blank">View source</a>
 </small>


@@ -799,7 +755,7 @@ asyncio.run(main())
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-base" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L791" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L764" target="_blank">View source</a>
 </small>


@@ -823,7 +779,7 @@ class A(42): ...  # error: [invalid-base]
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-context-manager" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L842" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L815" target="_blank">View source</a>
 </small>


@@ -850,7 +806,7 @@ with 1:
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-declaration" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L863" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L836" target="_blank">View source</a>
 </small>


@@ -879,7 +835,7 @@ a: str
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-exception-caught" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L886" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L859" target="_blank">View source</a>
 </small>


@@ -923,7 +879,7 @@ except ZeroDivisionError:
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.28">0.0.1-alpha.28</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-explicit-override" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1712" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1685" target="_blank">View source</a>
 </small>


@@ -965,7 +921,7 @@ class D(A):
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.35">0.0.1-alpha.35</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-frozen-dataclass-subclass" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2268" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2241" target="_blank">View source</a>
 </small>


@@ -1009,7 +965,7 @@ class NonFrozenChild(FrozenBase):  # Error raised here
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-generic-class" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L922" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L895" target="_blank">View source</a>
 </small>


@@ -1047,7 +1003,7 @@ class D(Generic[U, T]): ...
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-ignore-comment" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L74" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L72" target="_blank">View source</a>
 </small>


@@ -1077,7 +1033,7 @@ a = 20 / 0  # type: ignore
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.17">0.0.1-alpha.17</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-key" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L666" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L639" target="_blank">View source</a>
 </small>


@@ -1116,7 +1072,7 @@ carol = Person(name="Carol", age=25)  # typo!
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-legacy-type-variable" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L953" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L926" target="_blank">View source</a>
 </small>


@@ -1151,7 +1107,7 @@ def f(t: TypeVar("U")): ...
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-metaclass" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1050" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1023" target="_blank">View source</a>
 </small>


@@ -1185,7 +1141,7 @@ class B(metaclass=f): ...
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.20">0.0.1-alpha.20</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-method-override" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2170" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2143" target="_blank">View source</a>
 </small>


@@ -1292,7 +1248,7 @@ Correct use of `@override` is enforced by ty's `invalid-explicit-override` rule.
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.19">0.0.1-alpha.19</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-named-tuple" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L573" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L546" target="_blank">View source</a>
 </small>


@@ -1346,7 +1302,7 @@ AttributeError: Cannot overwrite NamedTuple attribute _asdict
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Preview (since <a href="https://github.com/astral-sh/ty/releases/tag/1.0.0">1.0.0</a>) ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-newtype" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1026" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L999" target="_blank">View source</a>
 </small>


@@ -1376,7 +1332,7 @@ Baz = NewType("Baz", int | str)  # error: invalid base for `typing.NewType`
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-overload" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1077" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1050" target="_blank">View source</a>
 </small>


@@ -1426,7 +1382,7 @@ def foo(x: int) -> int: ...
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-parameter-default" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1176" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1149" target="_blank">View source</a>
 </small>


@@ -1452,7 +1408,7 @@ def f(a: int = ''): ...
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-paramspec" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L981" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L954" target="_blank">View source</a>
 </small>


@@ -1483,7 +1439,7 @@ P2 = ParamSpec("S2")  # error: ParamSpec name must match the variable it's assig
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-protocol" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L509" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L482" target="_blank">View source</a>
 </small>


@@ -1517,7 +1473,7 @@ TypeError: Protocols can only inherit from other protocols, got <class 'int'>
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-raise" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1196" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1169" target="_blank">View source</a>
 </small>


@@ -1566,7 +1522,7 @@ def g():
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-return-type" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L720" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L693" target="_blank">View source</a>
 </small>


@@ -1591,7 +1547,7 @@ def func() -> int:
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-super-argument" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1239" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1212" target="_blank">View source</a>
 </small>


@@ -1637,49 +1593,11 @@ super(B, A)  # error: `A` does not satisfy `issubclass(A, B)`
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-syntax-in-forward-annotation" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fstring_annotation.rs#L111" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L111" target="_blank">View source</a>
 </small>


-**What it does**
-
-Checks for string-literal annotations where the string cannot be
-parsed as a Python expression.
-
-**Why is this bad?**
-
-Type annotations are expected to be Python expressions that
-describe the expected type of a variable, parameter, attribute or
-`return` statement.
-
-Type annotations are permitted to be string-literal expressions, in
-order to enable forward references to names not yet defined.
-However, it must be possible to parse the contents of that string
-literal as a normal Python expression.
-
-**Example**
-
-
-```python
-def foo() -> "intstance of C":
-    return 42
-
-class C: ...
-```
-
-Use instead:
-
-```python
-def foo() -> "C":
-    return 42
-
-class C: ...
-```
-
-**References**
-
- [Typing spec: The meaning of annotations](https://typing.python.org/en/latest/spec/annotations.html#the-meaning-of-annotations)
- [Typing spec: String annotations](https://typing.python.org/en/latest/spec/annotations.html#string-annotations)
+TODO #14889

 ## `invalid-type-alias-type`

@@ -1687,7 +1605,7 @@ class C: ...
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.6">0.0.1-alpha.6</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-alias-type" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1005" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L978" target="_blank">View source</a>
 </small>


@@ -1714,7 +1632,7 @@ NewAlias = TypeAliasType(get_name(), int)        # error: TypeAliasType name mus
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.29">0.0.1-alpha.29</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-arguments" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1471" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1444" target="_blank">View source</a>
 </small>


@@ -1761,7 +1679,7 @@ Bar[int]  # error: too few arguments
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-checking-constant" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1278" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1251" target="_blank">View source</a>
 </small>


@@ -1791,7 +1709,7 @@ TYPE_CHECKING = ''
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-form" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1302" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1275" target="_blank">View source</a>
 </small>


@@ -1821,7 +1739,7 @@ b: Annotated[int]  # `Annotated` expects at least two arguments
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.11">0.0.1-alpha.11</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-guard-call" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1354" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1327" target="_blank">View source</a>
 </small>


@@ -1855,7 +1773,7 @@ f(10)  # Error
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.11">0.0.1-alpha.11</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-guard-definition" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1326" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1299" target="_blank">View source</a>
 </small>


@@ -1889,7 +1807,7 @@ class C:
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20invalid-type-variable-constraints" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1382" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1355" target="_blank">View source</a>
 </small>


@@ -1924,7 +1842,7 @@ T = TypeVar('T', bound=str)  # valid bound TypeVar
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20missing-argument" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1411" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1384" target="_blank">View source</a>
 </small>


@@ -1949,7 +1867,7 @@ func()  # TypeError: func() missing 1 required positional argument: 'x'
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.20">0.0.1-alpha.20</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20missing-typed-dict-key" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2143" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2116" target="_blank">View source</a>
 </small>


@@ -1982,7 +1900,7 @@ alice["age"]  # KeyError
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20no-matching-overload" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1430" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1403" target="_blank">View source</a>
 </small>


@@ -2011,7 +1929,7 @@ func("string")  # error: [no-matching-overload]
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20non-subscriptable" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1453" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1426" target="_blank">View source</a>
 </small>


@@ -2035,7 +1953,7 @@ Subscripting an object that does not support it will raise a `TypeError` at runt
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20not-iterable" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1512" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1485" target="_blank">View source</a>
 </small>


@@ -2061,7 +1979,7 @@ for i in 34:  # TypeError: 'int' object is not iterable
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.29">0.0.1-alpha.29</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20override-of-final-method" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1685" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1658" target="_blank">View source</a>
 </small>


@@ -2094,7 +2012,7 @@ class B(A):
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20parameter-already-assigned" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1563" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1536" target="_blank">View source</a>
 </small>


@@ -2121,7 +2039,7 @@ f(1, x=2)  # Error raised here
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20positional-only-parameter-as-kwarg" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1896" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1869" target="_blank">View source</a>
 </small>


@@ -2148,7 +2066,7 @@ f(x=1)  # Error raised here
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-missing-attribute" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1584" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1557" target="_blank">View source</a>
 </small>


@@ -2176,7 +2094,7 @@ A.c  # AttributeError: type object 'A' has no attribute 'c'
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-missing-implicit-call" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L180" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L153" target="_blank">View source</a>
 </small>


@@ -2208,7 +2126,7 @@ A()[0]  # TypeError: 'A' object is not subscriptable
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'ignore'."><code>ignore</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-missing-import" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1606" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1579" target="_blank">View source</a>
 </small>


@@ -2245,7 +2163,7 @@ from module import a  # ImportError: cannot import name 'a' from 'module'
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'ignore'."><code>ignore</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20possibly-unresolved-reference" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1636" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1609" target="_blank">View source</a>
 </small>


@@ -2278,7 +2196,7 @@ print(x)  # NameError: name 'x' is not defined
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20raw-string-type-annotation" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fstring_annotation.rs#L61" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fstring_annotation.rs#L61" target="_blank">View source</a>
 </small>


@@ -2309,7 +2227,7 @@ def test(): -> "int":
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20redundant-cast" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2070" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2043" target="_blank">View source</a>
 </small>


@@ -2336,7 +2254,7 @@ cast(int, f())  # Redundant
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20static-assert-error" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2018" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1991" target="_blank">View source</a>
 </small>


@@ -2366,7 +2284,7 @@ static_assert(int(2.0 * 3.0) == 6)  # error: does not have a statically known tr
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20subclass-of-final-class" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1662" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1635" target="_blank">View source</a>
 </small>


@@ -2395,7 +2313,7 @@ class B(A): ...  # Error raised here
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Preview (since <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.30">0.0.1-alpha.30</a>) ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20super-call-in-named-tuple-method" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1830" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1803" target="_blank">View source</a>
 </small>


@@ -2429,7 +2347,7 @@ class F(NamedTuple):
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20too-many-positional-arguments" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1770" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1743" target="_blank">View source</a>
 </small>


@@ -2456,7 +2374,7 @@ f("foo")  # Error raised here
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20type-assertion-failure" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1748" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1721" target="_blank">View source</a>
 </small>


@@ -2484,7 +2402,7 @@ def _(x: int):
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unavailable-implicit-super-arguments" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1791" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1764" target="_blank">View source</a>
 </small>


@@ -2530,7 +2448,7 @@ class A:
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20undefined-reveal" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1857" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1830" target="_blank">View source</a>
 </small>


@@ -2554,7 +2472,7 @@ reveal_type(1)  # NameError: name 'reveal_type' is not defined
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unknown-argument" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1875" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1848" target="_blank">View source</a>
 </small>


@@ -2581,7 +2499,7 @@ f(x=1, y=2)  # Error raised here
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-attribute" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1917" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1890" target="_blank">View source</a>
 </small>


@@ -2609,7 +2527,7 @@ A().foo  # AttributeError: 'A' object has no attribute 'foo'
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.15">0.0.1-alpha.15</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-global" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2091" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L2064" target="_blank">View source</a>
 </small>


@@ -2667,7 +2585,7 @@ def g():
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-import" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1939" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1912" target="_blank">View source</a>
 </small>


@@ -2692,7 +2610,7 @@ import foo  # ModuleNotFoundError: No module named 'foo'
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unresolved-reference" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1958" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1931" target="_blank">View source</a>
 </small>


@@ -2717,7 +2635,7 @@ print(x)  # NameError: name 'x' is not defined
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.7">0.0.1-alpha.7</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-base" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L809" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L782" target="_blank">View source</a>
 </small>


@@ -2756,7 +2674,7 @@ class D(C): ...  # error: [unsupported-base]
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-bool-conversion" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1532" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1505" target="_blank">View source</a>
 </small>


@@ -2793,7 +2711,7 @@ b1 < b2 < b1  # exception raised here
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unsupported-operator" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1977" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1950" target="_blank">View source</a>
 </small>


@@ -2821,7 +2739,7 @@ A() + A()  # TypeError: unsupported operand type(s) for +: 'A' and 'A'
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'ignore'."><code>ignore</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20unused-ignore-comment" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L24" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Fsuppression.rs#L22" target="_blank">View source</a>
 </small>


@@ -2852,7 +2770,7 @@ a = 20 / 2
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'warn'."><code>warn</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.22">0.0.1-alpha.22</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20useless-overload-body" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1120" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1093" target="_blank">View source</a>
 </small>


@@ -2915,7 +2833,7 @@ def foo(x: int | str) -> int | str:
 Default level: <a href="../../rules#rule-levels" title="This lint has a default level of 'error'."><code>error</code></a> ·
 Added in <a href="https://github.com/astral-sh/ty/releases/tag/0.0.1-alpha.1">0.0.1-alpha.1</a> ·
 <a href="https://github.com/astral-sh/ty/issues?q=sort%3Aupdated-desc%20is%3Aissue%20is%3Aopen%20zero-stepsize-in-slice" target="_blank">Related issues</a> ·
-<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_types%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1999" target="_blank">View source</a>
+<a href="https://github.com/astral-sh/ruff/blob/main/crates%2Fty_python_semantic%2Fsrc%2Ftypes%2Fdiagnostic.rs#L1972" target="_blank">View source</a>
 </small>


--- a/crates/ty/src/lib.rs
+++ b/crates/ty/src/lib.rs
@@ -10,9 +10,9 @@ use ty_static::EnvVars;

 use std::fmt::Write;
 use std::process::{ExitCode, Termination};
-use std::sync::Mutex;

 use anyhow::Result;
+use std::sync::Mutex;

 use crate::args::{CheckCommand, Command, TerminalColor};
 use crate::logging::{VerbosityLevel, setup_tracing};
@@ -22,7 +22,6 @@ use clap::{CommandFactory, Parser};
 use colored::Colorize;
 use crossbeam::channel as crossbeam_channel;
 use rayon::ThreadPoolBuilder;
-use ruff_db::cancellation::{CancellationToken, CancellationTokenSource};
 use ruff_db::diagnostic::{
    Diagnostic, DiagnosticId, DisplayDiagnosticConfig, DisplayDiagnostics, Severity,
 };
@@ -122,9 +121,7 @@ fn run_check(args: CheckCommand) -> anyhow::Result<ExitStatus> {
    let force_exclude = args.force_exclude();

    let mut project_metadata = match &config_file {
-        Some(config_file) => {
-            ProjectMetadata::from_config_file(config_file.clone(), &project_path, &system)?
-        }
+        Some(config_file) => ProjectMetadata::from_config_file(config_file.clone(), &system)?,
        None => ProjectMetadata::discover(&project_path, &system)?,
    };

@@ -228,11 +225,6 @@ struct MainLoop {
    printer: Printer,

    project_options_overrides: ProjectOptionsOverrides,
-
-    /// Cancellation token that gets set by Ctrl+C.
-    /// Used for long-running operations on the main thread. Operations on background threads
-    /// use Salsa's cancellation mechanism.
-    cancellation_token: CancellationToken,
 }

 impl MainLoop {
@@ -242,9 +234,6 @@ impl MainLoop {
    ) -> (Self, MainLoopCancellationToken) {
        let (sender, receiver) = crossbeam_channel::bounded(10);

-        let cancellation_token_source = CancellationTokenSource::new();
-        let cancellation_token = cancellation_token_source.token();
-
        (
            Self {
                sender: sender.clone(),
@@ -252,12 +241,8 @@ impl MainLoop {
                watcher: None,
                project_options_overrides,
                printer,
-                cancellation_token,
-            },
-            MainLoopCancellationToken {
-                sender,
-                source: cancellation_token_source,
            },
+            MainLoopCancellationToken { sender },
        )
    }

@@ -329,7 +314,6 @@ impl MainLoop {
                    let display_config = DisplayDiagnosticConfig::default()
                        .format(terminal_settings.output_format.into())
                        .color(colored::control::SHOULD_COLORIZE.should_colorize())
-                        .with_cancellation_token(Some(self.cancellation_token.clone()))
                        .show_fix_diff(true);

                    if check_revision == revision {
@@ -373,21 +357,19 @@ impl MainLoop {
                                )?;
                            }

-                            if !self.cancellation_token.is_cancelled() {
-                                if is_human_readable {
-                                    writeln!(
-                                        self.printer.stream_for_failure_summary(),
-                                        "Found {} diagnostic{}",
-                                        diagnostics_count,
-                                        if diagnostics_count > 1 { "s" } else { "" }
-                                    )?;
-                                }
+                            if is_human_readable {
+                                writeln!(
+                                    self.printer.stream_for_failure_summary(),
+                                    "Found {} diagnostic{}",
+                                    diagnostics_count,
+                                    if diagnostics_count > 1 { "s" } else { "" }
+                                )?;
+                            }

-                                if exit_status.is_internal_error() {
-                                    tracing::warn!(
-                                        "A fatal error occurred while checking some files. Not all project files were analyzed. See the diagnostics list above for details."
-                                    );
-                                }
+                            if exit_status.is_internal_error() {
+                                tracing::warn!(
+                                    "A fatal error occurred while checking some files. Not all project files were analyzed. See the diagnostics list above for details."
+                                );
                            }

                            if self.watcher.is_none() {
@@ -514,12 +496,10 @@ impl ty_project::ProgressReporter for IndicatifReporter {
 #[derive(Debug)]
 struct MainLoopCancellationToken {
    sender: crossbeam_channel::Sender<MainLoopMessage>,
-    source: CancellationTokenSource,
 }

 impl MainLoopCancellationToken {
    fn stop(self) {
-        self.source.cancel();
        self.sender.send(MainLoopMessage::Exit).unwrap();
    }
 }
--- a/crates/ty/tests/cli/analysis_options.rs
+++ b/crates/ty/tests/cli/analysis_options.rs
@@ -1,43 +0,0 @@
-use insta_cmd::assert_cmd_snapshot;
-
-use crate::CliTest;
-
-/// ty ignores `type: ignore` comments when setting `respect-type-ignore-comments=false`
-#[test]
-fn respect_type_ignore_comments_is_turned_off() -> anyhow::Result<()> {
-    let case = CliTest::with_file(
-        "test.py",
-        r#"
-            y = a + 5  # type: ignore
-            "#,
-    )?;
-
-    // Assert that there's an `unresolved-reference` diagnostic (error).
-    assert_cmd_snapshot!(case.command(), @r"
-    success: true
-    exit_code: 0
-    ----- stdout -----
-    All checks passed!
-
-    ----- stderr -----
-    ");
-
-    assert_cmd_snapshot!(case.command().arg("--config").arg("analysis.respect-type-ignore-comments=false"), @r"
-    success: false
-    exit_code: 1
-    ----- stdout -----
-    error[unresolved-reference]: Name `a` used when not defined
-     --> test.py:2:5
-      |
-    2 | y = a + 5  # type: ignore
-      |     ^
-      |
-    info: rule `unresolved-reference` is enabled by default
-
-    Found 1 diagnostic
-
-    ----- stderr -----
-    ");
-
-    Ok(())
-}
--- a/crates/ty/tests/cli/config_option.rs
+++ b/crates/ty/tests/cli/config_option.rs
@@ -133,7 +133,7 @@ fn cli_config_args_invalid_option() -> anyhow::Result<()> {
      |
    1 | bad-option=true
      | ^^^^^^^^^^
-    unknown field `bad-option`, expected one of `environment`, `src`, `rules`, `terminal`, `analysis`, `overrides`
+    unknown field `bad-option`, expected one of `environment`, `src`, `rules`, `terminal`, `overrides`


    Usage: ty <COMMAND>
--- a/crates/ty/tests/cli/main.rs
+++ b/crates/ty/tests/cli/main.rs
@@ -1,4 +1,3 @@
-mod analysis_options;
 mod config_option;
 mod exit_code;
 mod file_selection;
@@ -659,8 +658,6 @@ fn gitlab_diagnostics() -> anyhow::Result<()> {
        r#"
        print(x)     # [unresolved-reference]
        print(4[1])  # [non-subscriptable]
-        from typing_extensions import reveal_type
-        reveal_type('str'.lower())  # [revealed-type]
        "#,
    )?;

@@ -711,25 +708,6 @@ fn gitlab_diagnostics() -> anyhow::Result<()> {
            }
          }
        }
-      },
-      {
-        "check_name": "revealed-type",
-        "description": "revealed-type: Revealed type: `LiteralString`",
-        "severity": "info",
-        "fingerprint": "[FINGERPRINT]",
-        "location": {
-          "path": "test.py",
-          "positions": {
-            "begin": {
-              "line": 5,
-              "column": 13
-            },
-            "end": {
-              "line": 5,
-              "column": 26
-            }
-          }
-        }
      }
    ]
    ----- stderr -----
@@ -745,8 +723,6 @@ fn github_diagnostics() -> anyhow::Result<()> {
        r#"
        print(x)     # [unresolved-reference]
        print(4[1])  # [non-subscriptable]
-        from typing_extensions import reveal_type
-        reveal_type('str'.lower())  # [revealed-type]
        "#,
    )?;

@@ -756,7 +732,6 @@ fn github_diagnostics() -> anyhow::Result<()> {
    ----- stdout -----
    ::warning title=ty (unresolved-reference),file=<temp_dir>/test.py,line=2,col=7,endLine=2,endColumn=8::test.py:2:7: unresolved-reference: Name `x` used when not defined
    ::error title=ty (non-subscriptable),file=<temp_dir>/test.py,line=3,col=7,endLine=3,endColumn=11::test.py:3:7: non-subscriptable: Cannot subscript object of type `Literal[4]` with no `__getitem__` method
-    ::notice title=ty (revealed-type),file=<temp_dir>/test.py,line=5,col=13,endLine=5,endColumn=26::test.py:5:13: revealed-type: Revealed type: `LiteralString`

    ----- stderr -----
    ");
--- a/crates/ty/tests/file_watching.rs
+++ b/crates/ty/tests/file_watching.rs
@@ -10,13 +10,12 @@ use ruff_db::system::{
    OsSystem, System, SystemPath, SystemPathBuf, UserConfigDirectoryOverrideGuard, file_time_now,
 };
 use ruff_python_ast::PythonVersion;
-use ty_module_resolver::{Module, ModuleName, resolve_module_confident};
 use ty_project::metadata::options::{EnvironmentOptions, Options, ProjectOptionsOverrides};
 use ty_project::metadata::pyproject::{PyProject, Tool};
 use ty_project::metadata::value::{RangedValue, RelativePathBuf};
 use ty_project::watch::{ChangeEvent, ProjectWatcher, directory_watcher};
 use ty_project::{Db, ProjectDatabase, ProjectMetadata};
-use ty_python_semantic::PythonPlatform;
+use ty_python_semantic::{Module, ModuleName, PythonPlatform, resolve_module_confident};

 struct TestCase {
    db: ProjectDatabase,
@@ -1020,7 +1019,7 @@ fn search_path() -> anyhow::Result<()> {
    let site_packages = case.root_path().join("site_packages");

    assert_eq!(
-        resolve_module_confident(case.db(), &ModuleName::new_static("a").unwrap()),
+        resolve_module_confident(case.db(), &ModuleName::new("a").unwrap()),
        None
    );

@@ -1193,7 +1192,7 @@ fn changed_versions_file() -> anyhow::Result<()> {

    // Unset the custom typeshed directory.
    assert_eq!(
-        resolve_module_confident(case.db(), &ModuleName::new_static("os").unwrap()),
+        resolve_module_confident(case.db(), &ModuleName::new("os").unwrap()),
        None
    );

@@ -1208,7 +1207,7 @@ fn changed_versions_file() -> anyhow::Result<()> {

    case.apply_changes(changes, None);

-    assert!(resolve_module_confident(case.db(), &ModuleName::new_static("os").unwrap()).is_some());
+    assert!(resolve_module_confident(case.db(), &ModuleName::new("os").unwrap()).is_some());

    Ok(())
 }
@@ -1875,11 +1874,11 @@ fn rename_files_casing_only() -> anyhow::Result<()> {
    let mut case = setup([("lib.py", "class Foo: ...")])?;

    assert!(
-        resolve_module_confident(case.db(), &ModuleName::new_static("lib").unwrap()).is_some(),
+        resolve_module_confident(case.db(), &ModuleName::new("lib").unwrap()).is_some(),
        "Expected `lib` module to exist."
    );
    assert_eq!(
-        resolve_module_confident(case.db(), &ModuleName::new_static("Lib").unwrap()),
+        resolve_module_confident(case.db(), &ModuleName::new("Lib").unwrap()),
        None,
        "Expected `Lib` module not to exist"
    );
@@ -1912,13 +1911,13 @@ fn rename_files_casing_only() -> anyhow::Result<()> {

    // Resolving `lib` should now fail but `Lib` should now succeed
    assert_eq!(
-        resolve_module_confident(case.db(), &ModuleName::new_static("lib").unwrap()),
+        resolve_module_confident(case.db(), &ModuleName::new("lib").unwrap()),
        None,
        "Expected `lib` module to no longer exist."
    );

    assert!(
-        resolve_module_confident(case.db(), &ModuleName::new_static("Lib").unwrap()).is_some(),
+        resolve_module_confident(case.db(), &ModuleName::new("Lib").unwrap()).is_some(),
        "Expected `Lib` module to exist"
    );

--- a/crates/ty_combine/Cargo.toml
+++ b/crates/ty_combine/Cargo.toml
@@ -12,6 +12,7 @@ license.workspace = true
 [dependencies]
 ruff_db = { workspace = true }
 ruff_python_ast = { workspace = true }
+ty_python_semantic = { workspace = true }

 ordermap = { workspace = true }

--- a/crates/ty_combine/src/lib.rs
+++ b/crates/ty_combine/src/lib.rs
@@ -8,6 +8,7 @@ use std::{collections::HashMap, hash::BuildHasher};
 use ordermap::OrderMap;
 use ruff_db::system::SystemPathBuf;
 use ruff_python_ast::PythonVersion;
+use ty_python_semantic::PythonPlatform;

 /// Combine two values, preferring the values in `self`.
 ///
@@ -144,6 +145,7 @@ macro_rules! impl_noop_combine {
 }

 impl_noop_combine!(SystemPathBuf);
+impl_noop_combine!(PythonPlatform);
 impl_noop_combine!(PythonVersion);

 // std types
--- a/crates/ty_completion_eval/Cargo.toml
+++ b/crates/ty_completion_eval/Cargo.toml
@@ -15,8 +15,8 @@ ruff_db = { workspace = true, features = ["os"] }
 ruff_text_size = { workspace = true }

 ty_ide = { workspace = true }
-ty_module_resolver = { workspace = true }
 ty_project = { workspace = true }
+ty_python_semantic = { workspace = true }

 anyhow = { workspace = true }
 bstr = { workspace = true }
--- a/crates/ty_completion_eval/src/main.rs
+++ b/crates/ty_completion_eval/src/main.rs
@@ -15,11 +15,11 @@ use regex::bytes::Regex;
 use ruff_db::files::system_path_to_file;
 use ruff_db::system::{OsSystem, SystemPath, SystemPathBuf};
 use ty_ide::Completion;
-use ty_module_resolver::ModuleName;
 use ty_project::metadata::Options;
 use ty_project::metadata::options::EnvironmentOptions;
 use ty_project::metadata::value::RelativePathBuf;
 use ty_project::{ProjectDatabase, ProjectMetadata};
+use ty_python_semantic::ModuleName;

 #[derive(Debug, clap::Parser)]
 #[command(
--- a/crates/ty_ide/Cargo.toml
+++ b/crates/ty_ide/Cargo.toml
@@ -22,9 +22,7 @@ ruff_python_importer = { workspace = true }
 ruff_python_trivia = { workspace = true }
 ruff_source_file = { workspace = true }
 ruff_text_size = { workspace = true }
-ty_module_resolver = { workspace = true }
 ty_python_semantic = { workspace = true }
-ty_python_types = { workspace = true }
 ty_project = { workspace = true, features = ["testing"] }
 ty_vendored = { workspace = true }

--- a/crates/ty_ide/src/all_symbols.rs
+++ b/crates/ty_ide/src/all_symbols.rs
@@ -1,6 +1,6 @@
 use ruff_db::files::File;
-use ty_module_resolver::{Module, ModuleName, all_modules, resolve_real_shadowable_module};
 use ty_project::Db;
+use ty_python_semantic::{Module, ModuleName, all_modules, resolve_real_shadowable_module};

 use crate::{
    SymbolKind,
@@ -21,7 +21,7 @@ pub fn all_symbols<'db>(
        return Vec::new();
    }

-    let typing_extensions = ModuleName::new_static("typing_extensions").unwrap();
+    let typing_extensions = ModuleName::new("typing_extensions").unwrap();
    let is_typing_extensions_available = importing_from.is_stub(db)
        || resolve_real_shadowable_module(db, importing_from, &typing_extensions).is_some();

--- a/crates/ty_ide/src/code_action.rs
+++ b/crates/ty_ide/src/code_action.rs
@@ -7,7 +7,7 @@ use ruff_text_size::TextRange;
 use ty_project::Db;
 use ty_python_semantic::create_suppression_fix;
 use ty_python_semantic::lint::LintId;
-use ty_python_types::types::{UNDEFINED_REVEAL, UNRESOLVED_REFERENCE};
+use ty_python_semantic::types::{UNDEFINED_REVEAL, UNRESOLVED_REFERENCE};

 /// A `QuickFix` Code Action
 #[derive(Debug, Clone)]
@@ -87,8 +87,10 @@ mod tests {
    use ruff_python_trivia::textwrap::dedent;
    use ruff_text_size::{TextRange, TextSize};
    use ty_project::ProjectMetadata;
-    use ty_python_semantic::lint::LintMetadata;
-    use ty_python_types::types::{UNDEFINED_REVEAL, UNRESOLVED_REFERENCE};
+    use ty_python_semantic::{
+        lint::LintMetadata,
+        types::{UNDEFINED_REVEAL, UNRESOLVED_REFERENCE},
+    };

    #[test]
    fn add_ignore() {
--- a/crates/ty_ide/src/completion.rs
+++ b/crates/ty_ide/src/completion.rs
@@ -11,9 +11,11 @@ use ruff_python_ast::{self as ast, AnyNodeRef};
 use ruff_python_codegen::Stylist;
 use ruff_text_size::{Ranged, TextRange, TextSize};
 use rustc_hash::FxHashSet;
-use ty_module_resolver::{KnownModule, ModuleName};
-use ty_python_types::types::{CycleDetector, KnownClass, Type, UnionType};
-use ty_python_types::{Completion as SemanticCompletion, NameKind, SemanticModel};
+use ty_python_semantic::types::UnionType;
+use ty_python_semantic::{
+    Completion as SemanticCompletion, KnownModule, ModuleName, NameKind, SemanticModel,
+    types::{CycleDetector, KnownClass, Type},
+};

 use crate::docstring::Docstring;
 use crate::goto::Definitions;
@@ -2104,7 +2106,7 @@ mod tests {
    use insta::assert_snapshot;
    use ruff_python_ast::token::{TokenKind, Tokens};
    use ruff_python_parser::{Mode, ParseOptions};
-    use ty_module_resolver::ModuleName;
+    use ty_python_semantic::ModuleName;

    use crate::completion::{Completion, completion};
    use crate::tests::{CursorTest, CursorTestBuilder};
--- a/crates/ty_ide/src/doc_highlights.rs
+++ b/crates/ty_ide/src/doc_highlights.rs
@@ -3,7 +3,7 @@ use crate::references::{ReferencesMode, references};
 use crate::{Db, ReferenceTarget};
 use ruff_db::files::File;
 use ruff_text_size::TextSize;
-use ty_python_types::SemanticModel;
+use ty_python_semantic::SemanticModel;

 /// Find all document highlights for a symbol at the given position.
 /// Document highlights are limited to the current file only.
--- a/crates/ty_ide/src/find_references.rs
+++ b/crates/ty_ide/src/find_references.rs
@@ -3,7 +3,7 @@ use crate::references::{ReferencesMode, references};
 use crate::{Db, ReferenceTarget};
 use ruff_db::files::File;
 use ruff_text_size::TextSize;
-use ty_python_types::SemanticModel;
+use ty_python_semantic::SemanticModel;

 /// Find all references to a symbol at the given position.
 /// Search for references across all files in the project.
--- a/crates/ty_ide/src/goto.rs
+++ b/crates/ty_ide/src/goto.rs
@@ -12,12 +12,12 @@ use ruff_python_ast::token::{TokenKind, Tokens};
 use ruff_python_ast::{self as ast, AnyNodeRef};
 use ruff_text_size::{Ranged, TextRange, TextSize};

-use ty_python_types::ResolvedDefinition;
-use ty_python_types::types::Type;
-use ty_python_types::types::ide_support::{
+use ty_python_semantic::ResolvedDefinition;
+use ty_python_semantic::types::Type;
+use ty_python_semantic::types::ide_support::{
    call_signature_details, call_type_simplified_by_overloads, definitions_for_keyword_argument,
 };
-use ty_python_types::{
+use ty_python_semantic::{
    HasDefinition, HasType, ImportAliasResolution, SemanticModel, definitions_for_imported_symbol,
    definitions_for_name,
 };
@@ -228,15 +228,15 @@ impl<'db> Definitions<'db> {
    pub(crate) fn from_ty(db: &'db dyn crate::Db, ty: Type<'db>) -> Option<Self> {
        let ty_def = ty.definition(db)?;
        let resolved = match ty_def {
-            ty_python_types::types::TypeDefinition::Module(module) => {
+            ty_python_semantic::types::TypeDefinition::Module(module) => {
                ResolvedDefinition::Module(module.file(db)?)
            }
-            ty_python_types::types::TypeDefinition::Class(definition)
-            | ty_python_types::types::TypeDefinition::Function(definition)
-            | ty_python_types::types::TypeDefinition::TypeVar(definition)
-            | ty_python_types::types::TypeDefinition::TypeAlias(definition)
-            | ty_python_types::types::TypeDefinition::SpecialForm(definition)
-            | ty_python_types::types::TypeDefinition::NewType(definition) => {
+            ty_python_semantic::types::TypeDefinition::Class(definition)
+            | ty_python_semantic::types::TypeDefinition::Function(definition)
+            | ty_python_semantic::types::TypeDefinition::TypeVar(definition)
+            | ty_python_semantic::types::TypeDefinition::TypeAlias(definition)
+            | ty_python_semantic::types::TypeDefinition::SpecialForm(definition)
+            | ty_python_semantic::types::TypeDefinition::NewType(definition) => {
                ResolvedDefinition::Definition(definition)
            }
        };
@@ -338,11 +338,11 @@ impl GotoTarget<'_> {
                }
            }
            GotoTarget::BinOp { expression, .. } => {
-                let (_, ty) = ty_python_types::definitions_for_bin_op(model, expression)?;
+                let (_, ty) = ty_python_semantic::definitions_for_bin_op(model, expression)?;
                Some(ty)
            }
            GotoTarget::UnaryOp { expression, .. } => {
-                let (_, ty) = ty_python_types::definitions_for_unary_op(model, expression)?;
+                let (_, ty) = ty_python_semantic::definitions_for_unary_op(model, expression)?;
                Some(ty)
            }
            // TODO: Support identifier targets
@@ -526,14 +526,15 @@ impl GotoTarget<'_> {
            }

            GotoTarget::BinOp { expression, .. } => {
-                let (definitions, _) = ty_python_types::definitions_for_bin_op(model, expression)?;
+                let (definitions, _) =
+                    ty_python_semantic::definitions_for_bin_op(model, expression)?;

                Some(definitions)
            }

            GotoTarget::UnaryOp { expression, .. } => {
                let (definitions, _) =
-                    ty_python_types::definitions_for_unary_op(model, expression)?;
+                    ty_python_semantic::definitions_for_unary_op(model, expression)?;

                Some(definitions)
            }
@@ -938,12 +939,12 @@ impl Ranged for GotoTarget<'_> {
 /// Converts a collection of `ResolvedDefinition` items into `NavigationTarget` items.
 fn convert_resolved_definitions_to_targets<'db>(
    db: &'db dyn ty_python_semantic::Db,
-    definitions: Vec<ty_python_types::ResolvedDefinition<'db>>,
+    definitions: Vec<ty_python_semantic::ResolvedDefinition<'db>>,
 ) -> Vec<crate::NavigationTarget> {
    definitions
        .into_iter()
        .map(|resolved_definition| match resolved_definition {
-            ty_python_types::ResolvedDefinition::Definition(definition) => {
+            ty_python_semantic::ResolvedDefinition::Definition(definition) => {
                // Get the parsed module for range calculation
                let definition_file = definition.file(db);
                let module = ruff_db::parsed::parsed_module(db, definition_file).load(db);
@@ -958,11 +959,11 @@ fn convert_resolved_definitions_to_targets<'db>(
                    full_range: full_range.range(),
                }
            }
-            ty_python_types::ResolvedDefinition::Module(file) => {
+            ty_python_semantic::ResolvedDefinition::Module(file) => {
                // For modules, navigate to the start of the file
                crate::NavigationTarget::new(file, TextRange::default())
            }
-            ty_python_types::ResolvedDefinition::FileWithRange(file_range) => {
+            ty_python_semantic::ResolvedDefinition::FileWithRange(file_range) => {
                // For file ranges, navigate to the specific range within the file
                crate::NavigationTarget::from(file_range)
            }
@@ -983,9 +984,9 @@ fn definitions_for_expression<'db>(
            expression.into(),
            alias_resolution,
        )),
-        ast::ExprRef::Attribute(attribute) => {
-            Some(ty_python_types::definitions_for_attribute(model, attribute))
-        }
+        ast::ExprRef::Attribute(attribute) => Some(ty_python_semantic::definitions_for_attribute(
+            model, attribute,
+        )),
        _ => None,
    }
 }
@@ -1006,7 +1007,7 @@ fn definitions_for_callable<'db>(
 fn definitions_to_navigation_targets<'db>(
    db: &dyn ty_python_semantic::Db,
    stub_mapper: Option<&StubMapper<'db>>,
-    mut definitions: Vec<ty_python_types::ResolvedDefinition<'db>>,
+    mut definitions: Vec<ty_python_semantic::ResolvedDefinition<'db>>,
 ) -> Option<crate::NavigationTargets> {
    if let Some(mapper) = stub_mapper {
        definitions = mapper.map_definitions(definitions);
--- a/crates/ty_ide/src/goto_declaration.rs
+++ b/crates/ty_ide/src/goto_declaration.rs
@@ -3,7 +3,7 @@ use crate::{Db, NavigationTargets, RangedValue};
 use ruff_db::files::{File, FileRange};
 use ruff_db::parsed::parsed_module;
 use ruff_text_size::{Ranged, TextSize};
-use ty_python_types::{ImportAliasResolution, SemanticModel};
+use ty_python_semantic::{ImportAliasResolution, SemanticModel};

 /// Navigate to the declaration of a symbol.
 ///
--- a/crates/ty_ide/src/goto_definition.rs
+++ b/crates/ty_ide/src/goto_definition.rs
@@ -3,7 +3,7 @@ use crate::{Db, NavigationTargets, RangedValue};
 use ruff_db::files::{File, FileRange};
 use ruff_db::parsed::parsed_module;
 use ruff_text_size::{Ranged, TextSize};
-use ty_python_types::{ImportAliasResolution, SemanticModel};
+use ty_python_semantic::{ImportAliasResolution, SemanticModel};

 /// Navigate to the definition of a symbol.
 ///
--- a/crates/ty_ide/src/goto_type_definition.rs
+++ b/crates/ty_ide/src/goto_type_definition.rs
@@ -3,7 +3,7 @@ use crate::{Db, HasNavigationTargets, NavigationTargets, RangedValue};
 use ruff_db::files::{File, FileRange};
 use ruff_db::parsed::parsed_module;
 use ruff_text_size::{Ranged, TextSize};
-use ty_python_types::SemanticModel;
+use ty_python_semantic::SemanticModel;

 pub fn goto_type_definition(
    db: &dyn Db,
--- a/crates/ty_ide/src/hover.rs
+++ b/crates/ty_ide/src/hover.rs
@@ -6,8 +6,8 @@ use ruff_db::parsed::parsed_module;
 use ruff_text_size::{Ranged, TextSize};
 use std::fmt;
 use std::fmt::Formatter;
-use ty_python_types::types::{KnownInstanceType, Type, TypeVarVariance};
-use ty_python_types::{DisplaySettings, SemanticModel};
+use ty_python_semantic::types::{KnownInstanceType, Type, TypeVarVariance};
+use ty_python_semantic::{DisplaySettings, SemanticModel};

 pub fn hover(db: &dyn Db, file: File, offset: TextSize) -> Option<RangedValue<Hover<'_>>> {
    let parsed = parsed_module(db, file).load(db);
@@ -23,7 +23,7 @@ pub fn hover(db: &dyn Db, file: File, offset: TextSize) -> Option<RangedValue<Ho
    let docs = goto_target
        .get_definition_targets(
            &model,
-            ty_python_types::ImportAliasResolution::ResolveAliases,
+            ty_python_semantic::ImportAliasResolution::ResolveAliases,
        )
        .and_then(|definitions| definitions.docstring(db))
        .map(HoverContent::Docstring);
--- a/crates/ty_ide/src/importer.rs
+++ b/crates/ty_ide/src/importer.rs
@@ -29,11 +29,10 @@ use ruff_python_ast::visitor::source_order::{SourceOrderVisitor, TraversalSignal
 use ruff_python_codegen::Stylist;
 use ruff_python_importer::Insertion;
 use ruff_text_size::{Ranged, TextRange, TextSize};
-use ty_module_resolver::ModuleName;
 use ty_project::Db;
 use ty_python_semantic::semantic_index::definition::DefinitionKind;
-use ty_python_types::types::Type;
-use ty_python_types::{MemberDefinition, SemanticModel};
+use ty_python_semantic::types::Type;
+use ty_python_semantic::{MemberDefinition, ModuleName, SemanticModel};

 pub(crate) struct Importer<'a> {
    /// The ty Salsa database.
@@ -881,10 +880,11 @@ mod tests {
    use ruff_python_codegen::Stylist;
    use ruff_python_trivia::textwrap::dedent;
    use ruff_text_size::TextSize;
-    use ty_module_resolver::SearchPathSettings;
    use ty_project::ProjectMetadata;
-    use ty_python_semantic::{Program, ProgramSettings, PythonPlatform, PythonVersionWithSource};
-    use ty_python_types::SemanticModel;
+    use ty_python_semantic::{
+        Program, ProgramSettings, PythonPlatform, PythonVersionWithSource, SearchPathSettings,
+        SemanticModel,
+    };

    use super::*;

--- a/crates/ty_ide/src/inlay_hints.rs
+++ b/crates/ty_ide/src/inlay_hints.rs
@@ -6,9 +6,9 @@ use ruff_db::parsed::parsed_module;
 use ruff_python_ast::visitor::source_order::{self, SourceOrderVisitor, TraversalSignal};
 use ruff_python_ast::{AnyNodeRef, ArgOrKeyword, Expr, ExprUnaryOp, Stmt, UnaryOp};
 use ruff_text_size::{Ranged, TextRange, TextSize};
-use ty_python_types::types::ide_support::inlay_hint_call_argument_details;
-use ty_python_types::types::{Type, TypeDetail};
-use ty_python_types::{HasType, SemanticModel};
+use ty_python_semantic::types::ide_support::inlay_hint_call_argument_details;
+use ty_python_semantic::types::{Type, TypeDetail};
+use ty_python_semantic::{HasType, SemanticModel};

 #[derive(Debug, Clone)]
 pub struct InlayHint {
@@ -6614,6 +6614,13 @@ mod tests {
        3 |     y[: type[T@f]] = x
          |              ^^^
          |
+
+        ---------------------------------------------
+        info[inlay-hint-edit]: File after edits
+        info: Source
+
+        def f[T](x: type[T]):
+            y: type[T@f] = x
        "#);
    }

--- a/crates/ty_ide/src/lib.rs
+++ b/crates/ty_ide/src/lib.rs
@@ -57,7 +57,7 @@ use ruff_text_size::{Ranged, TextRange};
 use rustc_hash::FxHashSet;
 use std::ops::{Deref, DerefMut};
 use ty_project::Db;
-use ty_python_types::types::{Type, TypeDefinition};
+use ty_python_semantic::types::{Type, TypeDefinition};

 /// Information associated with a text range.
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
--- a/crates/ty_ide/src/references.rs
+++ b/crates/ty_ide/src/references.rs
@@ -20,7 +20,7 @@ use ruff_python_ast::{
    visitor::source_order::{SourceOrderVisitor, TraversalSignal},
 };
 use ruff_text_size::{Ranged, TextRange};
-use ty_python_types::{ImportAliasResolution, SemanticModel};
+use ty_python_semantic::{ImportAliasResolution, SemanticModel};

 /// Mode for references search behavior
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
--- a/crates/ty_ide/src/rename.rs
+++ b/crates/ty_ide/src/rename.rs
@@ -3,7 +3,7 @@ use crate::references::{ReferencesMode, references};
 use crate::{Db, ReferenceTarget};
 use ruff_db::files::File;
 use ruff_text_size::{Ranged, TextSize};
-use ty_python_types::SemanticModel;
+use ty_python_semantic::SemanticModel;

 /// Returns the range of the symbol if it can be renamed, None if not.
 pub fn can_rename(db: &dyn Db, file: File, offset: TextSize) -> Option<ruff_text_size::TextRange> {
--- a/crates/ty_ide/src/semantic_tokens.rs
+++ b/crates/ty_ide/src/semantic_tokens.rs
@@ -17,6 +17,9 @@
 //! TODO: Need to properly handle Annotated expressions. All type arguments other
 //! than the first should be treated as value expressions, not as type expressions.
 //!
+//! TODO: An identifier that resolves to a parameter when used within a function
+//! should be classified as a parameter, selfParameter, or clsParameter token.
+//!
 //! TODO: Properties (or perhaps more generally, descriptor objects?) should be
 //! classified as property tokens rather than just variables.
 //!
@@ -44,10 +47,10 @@ use ruff_python_ast::{
 use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
 use std::ops::Deref;
 use ty_python_semantic::semantic_index::definition::Definition;
-use ty_python_semantic::semantic_index::definition::DefinitionKind;
-use ty_python_types::types::TypeVarKind;
-use ty_python_types::{
-    HasType, SemanticModel, types::Type, types::ide_support::definition_for_name,
+use ty_python_semantic::types::TypeVarKind;
+use ty_python_semantic::{
+    HasType, SemanticModel, semantic_index::definition::DefinitionKind, types::Type,
+    types::ide_support::definition_for_name,
 };

 /// Semantic token types supported by the language server.
@@ -227,11 +230,6 @@ impl<'db> SemanticTokenVisitor<'db> {
        modifiers: SemanticTokenModifier,
    ) {
        let range = ranged.range();
-
-        if range.is_empty() {
-            return;
-        }
-
        // Only emit tokens that intersect with the range filter, if one is specified
        if let Some(range_filter) = self.range_filter {
            // Only include ranges that have a non-empty overlap. Adjacent ranges
@@ -272,7 +270,7 @@ impl<'db> SemanticTokenVisitor<'db> {
        let definition = definition_for_name(
            self.model,
            name,
-            ty_python_types::ImportAliasResolution::ResolveAliases,
+            ty_python_semantic::ImportAliasResolution::ResolveAliases,
        );

        if let Some(definition) = definition {
@@ -709,15 +707,15 @@ impl SourceOrderVisitor<'_> for SemanticTokenVisitor<'_> {
            }
            ast::Stmt::Import(import) => {
                for alias in &import.names {
-                    // Create separate tokens for each part of a dotted module name
-                    self.add_dotted_name_tokens(&alias.name, SemanticTokenType::Namespace);
-
                    if let Some(asname) = &alias.asname {
                        self.add_token(
                            asname.range(),
                            SemanticTokenType::Namespace,
                            SemanticTokenModifier::empty(),
                        );
+                    } else {
+                        // Create separate tokens for each part of a dotted module name
+                        self.add_dotted_name_tokens(&alias.name, SemanticTokenType::Namespace);
                    }
                }
            }
@@ -1133,7 +1131,7 @@ mod tests {
    use ty_project::ProjectMetadata;

    #[test]
-    fn semantic_tokens_basic() {
+    fn test_semantic_tokens_basic() {
        let test = SemanticTokenTest::new("def foo(): pass");

        let tokens = test.highlight_file();
@@ -1144,7 +1142,7 @@ mod tests {
    }

    #[test]
-    fn semantic_tokens_class() {
+    fn test_semantic_tokens_class() {
        let test = SemanticTokenTest::new("class MyClass: pass");

        let tokens = test.highlight_file();
@@ -1155,7 +1153,7 @@ mod tests {
    }

    #[test]
-    fn semantic_tokens_class_args() {
+    fn test_semantic_tokens_class_args() {
        // This used to cause a panic because of an incorrect
        // insertion-order when visiting arguments inside
        // class definitions.
@@ -1171,7 +1169,7 @@ mod tests {
    }

    #[test]
-    fn semantic_tokens_variables() {
+    fn test_semantic_tokens_variables() {
        let test = SemanticTokenTest::new(
            "
 x = 42
@@ -1190,7 +1188,7 @@ y = 'hello'
    }

    #[test]
-    fn semantic_tokens_walrus() {
+    fn test_semantic_tokens_walrus() {
        let test = SemanticTokenTest::new(
            "
 if x := 42:
@@ -1209,7 +1207,7 @@ if x := 42:
    }

    #[test]
-    fn semantic_tokens_self_parameter() {
+    fn test_semantic_tokens_self_parameter() {
        let test = SemanticTokenTest::new(
            "
 class MyClass:
@@ -1240,7 +1238,7 @@ class MyClass:
    }

    #[test]
-    fn semantic_tokens_cls_parameter() {
+    fn test_semantic_tokens_cls_parameter() {
        let test = SemanticTokenTest::new(
            "
 class MyClass:
@@ -1263,7 +1261,7 @@ class MyClass:
    }

    #[test]
-    fn semantic_tokens_staticmethod_parameter() {
+    fn test_semantic_tokens_staticmethod_parameter() {
        let test = SemanticTokenTest::new(
            "
 class MyClass:
@@ -1284,7 +1282,7 @@ class MyClass:
    }

    #[test]
-    fn semantic_tokens_custom_self_cls_names() {
+    fn test_semantic_tokens_custom_self_cls_names() {
        let test = SemanticTokenTest::new(
            "
 class MyClass:
@@ -1319,7 +1317,7 @@ class MyClass:
    }

    #[test]
-    fn semantic_tokens_modifiers() {
+    fn test_semantic_tokens_modifiers() {
        let test = SemanticTokenTest::new(
            "
 class MyClass:
@@ -1340,7 +1338,7 @@ class MyClass:
    }

    #[test]
-    fn semantic_classification_vs_heuristic() {
+    fn test_semantic_classification_vs_heuristic() {
        let test = SemanticTokenTest::new(
            "
 import sys
@@ -1374,7 +1372,7 @@ z = sys.version
    }

    #[test]
-    fn builtin_constants() {
+    fn test_builtin_constants() {
        let test = SemanticTokenTest::new(
            "
 x = True
@@ -1396,7 +1394,7 @@ z = None
    }

    #[test]
-    fn builtin_constants_in_expressions() {
+    fn test_builtin_constants_in_expressions() {
        let test = SemanticTokenTest::new(
            "
 def check(value):
@@ -1424,7 +1422,7 @@ result = check(None)
    }

    #[test]
-    fn builtin_types() {
+    fn test_builtin_types() {
        let test = SemanticTokenTest::new(
            r#"
            type U = str | int
@@ -1469,7 +1467,7 @@ result = check(None)
    }

    #[test]
-    fn semantic_tokens_range() {
+    fn test_semantic_tokens_range() {
        let test = SemanticTokenTest::new(
            "
 def function1():
@@ -1534,7 +1532,7 @@ def function2():
    /// When a token starts right at where the requested range ends,
    /// don't include it in the semantic tokens.
    #[test]
-    fn semantic_tokens_range_excludes_boundary_tokens() {
+    fn test_semantic_tokens_range_excludes_boundary_tokens() {
        let test = SemanticTokenTest::new(
            "
 x = 1
@@ -1557,7 +1555,7 @@ z = 3
    }

    #[test]
-    fn dotted_module_names() {
+    fn test_dotted_module_names() {
        let test = SemanticTokenTest::new(
            "
 import os.path
@@ -1584,7 +1582,7 @@ from collections.abc import Mapping
    }

    #[test]
-    fn module_type_classification() {
+    fn test_module_type_classification() {
        let test = SemanticTokenTest::new(
            "
 import os
@@ -1612,7 +1610,7 @@ y = sys
    }

    #[test]
-    fn import_classification() {
+    fn test_import_classification() {
        let test = SemanticTokenTest::new(
            "
 from os import path
@@ -1643,7 +1641,7 @@ from mymodule import CONSTANT, my_function, MyClass
    }

    #[test]
-    fn str_annotation() {
+    fn test_str_annotation() {
        let test = SemanticTokenTest::new(
            r#"
 x: int = 1
@@ -1687,7 +1685,7 @@ w5: "float
    }

    #[test]
-    fn attribute_classification() {
+    fn test_attribute_classification() {
        let test = SemanticTokenTest::new(
            "
 import os
@@ -1761,7 +1759,7 @@ u = List.__name__        # __name__ should be variable
    }

    #[test]
-    fn attribute_fallback_classification() {
+    fn test_attribute_fallback_classification() {
        let test = SemanticTokenTest::new(
            "
 class MyClass:
@@ -1792,7 +1790,7 @@ y = obj.unknown_attr     # Should fall back to variable
    }

    #[test]
-    fn constant_name_detection() {
+    fn test_constant_name_detection() {
        let test = SemanticTokenTest::new(
            "
 class MyClass:
@@ -1839,7 +1837,7 @@ w = obj.A             # Should not have readonly modifier (length == 1)
    }

    #[test]
-    fn type_annotations() {
+    fn test_type_annotations() {
        let test = SemanticTokenTest::new(
            r#"
 from typing import List, Optional
@@ -2327,7 +2325,7 @@ class MyClass:
    }

    #[test]
-    fn debug_int_classification() {
+    fn test_debug_int_classification() {
        let test = SemanticTokenTest::new(
            "
 x: int = 42
@@ -2344,7 +2342,7 @@ x: int = 42
    }

    #[test]
-    fn debug_user_defined_type_classification() {
+    fn test_debug_user_defined_type_classification() {
        let test = SemanticTokenTest::new(
            "
 class MyClass:
@@ -2365,7 +2363,7 @@ x: MyClass = MyClass()
    }

    #[test]
-    fn type_annotation_vs_variable_classification() {
+    fn test_type_annotation_vs_variable_classification() {
        let test = SemanticTokenTest::new(
            "
 from typing import List, Optional
@@ -2415,7 +2413,7 @@ def test_function(param: int, other: MyClass) -> Optional[List[str]]:
    }

    #[test]
-    fn protocol_types_in_annotations() {
+    fn test_protocol_types_in_annotations() {
        let test = SemanticTokenTest::new(
            "
 from typing import Protocol
@@ -2446,7 +2444,7 @@ def test_function(param: MyProtocol) -> None:
    }

    #[test]
-    fn protocol_type_annotation_vs_value_context() {
+    fn test_protocol_type_annotation_vs_value_context() {
        let test = SemanticTokenTest::new(
            "
 from typing import Protocol
@@ -2532,7 +2530,7 @@ def test_function(param: my_type_alias): ...
    }

    #[test]
-    fn type_parameters_pep695() {
+    fn test_type_parameters_pep695() {
        let test = SemanticTokenTest::new(
            "
 # Test Python 3.12 PEP 695 type parameter syntax
@@ -2656,7 +2654,7 @@ class BoundedContainer[T: int, U = str]:
    }

    #[test]
-    fn type_parameters_usage_in_function_body() {
+    fn test_type_parameters_usage_in_function_body() {
        let test = SemanticTokenTest::new(
            "
 def generic_function[T](value: T) -> T:
@@ -2685,7 +2683,7 @@ def generic_function[T](value: T) -> T:
    }

    #[test]
-    fn decorator_classification() {
+    fn test_decorator_classification() {
        let test = SemanticTokenTest::new(
            r#"
@staticmethod
@@ -2715,7 +2713,7 @@ class MyClass:
    }

    #[test]
-    fn constant_variations() {
+    fn test_constant_variations() {
        let test = SemanticTokenTest::new(
            r#"
 A = 1
@@ -2758,7 +2756,7 @@ A_1 = 1
    }

    #[test]
-    fn implicitly_concatenated_strings() {
+    fn test_implicitly_concatenated_strings() {
        let test = SemanticTokenTest::new(
            r#"x = "hello" "world"
 y = ("multi"
@@ -2785,7 +2783,7 @@ z = 'single' "mixed" 'quotes'"#,
    }

    #[test]
-    fn bytes_literals() {
+    fn test_bytes_literals() {
        let test = SemanticTokenTest::new(
            r#"x = b"hello" b"world"
 y = (b"multi"
@@ -2812,7 +2810,7 @@ z = b'single' b"mixed" b'quotes'"#,
    }

    #[test]
-    fn mixed_string_and_bytes_literals() {
+    fn test_mixed_string_and_bytes_literals() {
        let test = SemanticTokenTest::new(
            r#"# Test mixed string and bytes literals
 string_concat = "hello" "world"
@@ -2848,7 +2846,7 @@ regular_bytes = b"just bytes""#,
    }

    #[test]
-    fn fstring_with_mixed_literals() {
+    fn test_fstring_with_mixed_literals() {
        let test = SemanticTokenTest::new(
            r#"
 # Test f-strings with various literal types
@@ -2900,7 +2898,7 @@ complex_fstring = f"User: {name.upper()}, Count: {len(data)}, Hex: {value:x}"
    }

    #[test]
-    fn nonlocal_and_global_statements() {
+    fn test_nonlocal_and_global_statements() {
        let test = SemanticTokenTest::new(
            r#"
 x = "global_value"
@@ -2962,7 +2960,7 @@ def outer():
    }

    #[test]
-    fn nonlocal_global_edge_cases() {
+    fn test_nonlocal_global_edge_cases() {
        let test = SemanticTokenTest::new(
            r#"
 # Single variable statements
@@ -3002,7 +3000,7 @@ def test():
    }

    #[test]
-    fn pattern_matching() {
+    fn test_pattern_matching() {
        let test = SemanticTokenTest::new(
            r#"
 def process_data(data):
@@ -3058,7 +3056,7 @@ def process_data(data):
    }

    #[test]
-    fn exception_handlers() {
+    fn test_exception_handlers() {
        let test = SemanticTokenTest::new(
            r#"
 try:
@@ -3097,7 +3095,7 @@ finally:
    }

    #[test]
-    fn self_attribute_expression() {
+    fn test_self_attribute_expression() {
        let test = SemanticTokenTest::new(
            r#"
 from typing import Self
@@ -3137,7 +3135,7 @@ class C:
    }

    #[test]
-    fn augmented_assignment() {
+    fn test_augmented_assignment() {
        let test = SemanticTokenTest::new(
            r#"
 x = 0
@@ -3156,7 +3154,7 @@ x += 1
    }

    #[test]
-    fn type_alias() {
+    fn test_type_alias() {
        let test = SemanticTokenTest::new("type MyList[T] = list[T]");

        let tokens = test.highlight_file();
@@ -3170,7 +3168,7 @@ x += 1
    }

    #[test]
-    fn for_stmt() {
+    fn test_for_stmt() {
        let test = SemanticTokenTest::new(
            r#"
 for item in []:
@@ -3192,7 +3190,7 @@ else:
    }

    #[test]
-    fn with_stmt() {
+    fn test_with_stmt() {
        let test = SemanticTokenTest::new(
            r#"
 with open("file.txt") as f:
@@ -3212,7 +3210,7 @@ with open("file.txt") as f:
    }

    #[test]
-    fn comprehensions() {
+    fn test_comprehensions() {
        let test = SemanticTokenTest::new(
            r#"
 list_comp = [x for x in range(10) if x % 2 == 0]
@@ -3257,7 +3255,7 @@ generator = (x for x in range(10))

    /// Regression test for <https://github.com/astral-sh/ty/issues/1406>
    #[test]
-    fn invalid_kwargs() {
+    fn test_invalid_kwargs() {
        let test = SemanticTokenTest::new(
            r#"
 def foo(self, **key, value=10):
@@ -3276,24 +3274,6 @@ def foo(self, **key, value=10):
        "#);
    }

-    #[test]
-    fn import_as() {
-        let test = SemanticTokenTest::new(
-            r#"
-            import pathlib as path
-            from pathlib import Path
-            "#,
-        );
-
-        let tokens = test.highlight_file();
-        assert_snapshot!(test.to_snapshot(&tokens), @r#"
-        "pathlib" @ 8..15: Namespace
-        "path" @ 19..23: Namespace
-        "pathlib" @ 29..36: Namespace
-        "Path" @ 44..48: Class
-        "#);
-    }
-
    pub(super) struct SemanticTokenTest {
        pub(super) db: ty_project::TestDb,
        file: File,
--- a/crates/ty_ide/src/signature_help.rs
+++ b/crates/ty_ide/src/signature_help.rs
@@ -15,13 +15,13 @@ use ruff_python_ast::find_node::covering_node;
 use ruff_python_ast::token::TokenKind;
 use ruff_python_ast::{self as ast, AnyNodeRef};
 use ruff_text_size::{Ranged, TextRange, TextSize};
+use ty_python_semantic::ResolvedDefinition;
+use ty_python_semantic::SemanticModel;
 use ty_python_semantic::semantic_index::definition::Definition;
-use ty_python_types::ResolvedDefinition;
-use ty_python_types::SemanticModel;
-use ty_python_types::types::ide_support::{
+use ty_python_semantic::types::ide_support::{
    CallSignatureDetails, call_signature_details, find_active_signature_from_details,
 };
-use ty_python_types::types::{ParameterKind, Type};
+use ty_python_semantic::types::{ParameterKind, Type};

 // TODO: We may want to add special-case handling for calls to constructors
 // so the class docstring is used in place of (or inaddition to) any docstring
--- a/crates/ty_ide/src/stub_mapping.rs
+++ b/crates/ty_ide/src/stub_mapping.rs
@@ -1,6 +1,6 @@
 use itertools::Either;
 use ruff_db::system::SystemPathBuf;
-use ty_python_types::{ResolvedDefinition, map_stub_definition};
+use ty_python_semantic::{ResolvedDefinition, map_stub_definition};

 use crate::cached_vendored_root;

--- a/crates/ty_ide/src/symbols.rs
+++ b/crates/ty_ide/src/symbols.rs
@@ -14,8 +14,8 @@ use ruff_python_ast::name::{Name, UnqualifiedName};
 use ruff_python_ast::visitor::source_order::{self, SourceOrderVisitor};
 use ruff_text_size::{Ranged, TextRange};
 use rustc_hash::{FxHashMap, FxHashSet};
-use ty_module_resolver::{ModuleName, resolve_module};
 use ty_project::Db;
+use ty_python_semantic::{ModuleName, resolve_module};

 use crate::completion::CompletionKind;

--- a/crates/ty_module_resolver/Cargo.toml
+++ b/crates/ty_module_resolver/Cargo.toml
@@ -1,38 +0,0 @@
-[package]
-name = "ty_module_resolver"
-version = "0.0.0"
-publish = false
-authors = { workspace = true }
-edition = { workspace = true }
-rust-version = { workspace = true }
-homepage = { workspace = true }
-documentation = { workspace = true }
-repository = { workspace = true }
-license = { workspace = true }
-
-[dependencies]
-ruff_db = { workspace = true }
-ruff_memory_usage = { workspace = true }
-ruff_python_ast = { workspace = true, features = ["salsa"] }
-ruff_python_stdlib = { workspace = true }
-
-camino = { workspace = true }
-compact_str = { workspace = true }
-get-size2 = { workspace = true }
-rustc-hash = { workspace = true }
-salsa = { workspace = true }
-thiserror = { workspace = true }
-tracing = { workspace = true }
-strum = { workspace = true }
-strum_macros = { workspace = true }
-
-[dev-dependencies]
-ruff_db = { workspace = true, features = ["testing", "os"] }
-ty_vendored = { workspace = true }
-
-anyhow = { workspace = true }
-insta = { workspace = true, features = ["filters"] }
-tempfile = { workspace = true }
-
-[lints]
-workspace = true
--- a/crates/ty_module_resolver/src/db.rs
+++ b/crates/ty_module_resolver/src/db.rs
@@ -1,124 +0,0 @@
-use ruff_db::Db as SourceDb;
-
-use crate::resolve::SearchPaths;
-
-#[salsa::db]
-pub trait Db: SourceDb {
-    /// Returns the search paths for module resolution.
-    fn search_paths(&self) -> &SearchPaths;
-}
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use std::sync::{Arc, Mutex};
-
-    use ruff_db::Db as SourceDb;
-    use ruff_db::files::Files;
-    use ruff_db::system::{DbWithTestSystem, TestSystem};
-    use ruff_db::vendored::VendoredFileSystem;
-    use ruff_python_ast::PythonVersion;
-
-    use super::Db;
-    use crate::resolve::SearchPaths;
-
-    type Events = Arc<Mutex<Vec<salsa::Event>>>;
-
-    #[salsa::db]
-    #[derive(Clone)]
-    pub(crate) struct TestDb {
-        storage: salsa::Storage<Self>,
-        files: Files,
-        system: TestSystem,
-        vendored: VendoredFileSystem,
-        search_paths: Arc<SearchPaths>,
-        python_version: PythonVersion,
-        events: Events,
-    }
-
-    impl TestDb {
-        pub(crate) fn new() -> Self {
-            let events = Events::default();
-            Self {
-                storage: salsa::Storage::new(Some(Box::new({
-                    let events = events.clone();
-                    move |event| {
-                        tracing::trace!("event: {event:?}");
-                        let mut events = events.lock().unwrap();
-                        events.push(event);
-                    }
-                }))),
-                system: TestSystem::default(),
-                vendored: ty_vendored::file_system().clone(),
-                files: Files::default(),
-                search_paths: Arc::new(SearchPaths::empty(ty_vendored::file_system())),
-                python_version: PythonVersion::default(),
-                events,
-            }
-        }
-
-        pub(crate) fn with_search_paths(mut self, search_paths: SearchPaths) -> Self {
-            self.set_search_paths(search_paths);
-            self
-        }
-
-        pub(crate) fn with_python_version(mut self, python_version: PythonVersion) -> Self {
-            self.python_version = python_version;
-            self
-        }
-
-        pub(crate) fn set_search_paths(&mut self, search_paths: SearchPaths) {
-            search_paths.try_register_static_roots(self);
-            self.search_paths = Arc::new(search_paths);
-        }
-
-        /// Takes the salsa events.
-        pub(crate) fn take_salsa_events(&mut self) -> Vec<salsa::Event> {
-            let mut events = self.events.lock().unwrap();
-            std::mem::take(&mut *events)
-        }
-
-        /// Clears the salsa events.
-        pub(crate) fn clear_salsa_events(&mut self) {
-            self.take_salsa_events();
-        }
-    }
-
-    impl DbWithTestSystem for TestDb {
-        fn test_system(&self) -> &TestSystem {
-            &self.system
-        }
-
-        fn test_system_mut(&mut self) -> &mut TestSystem {
-            &mut self.system
-        }
-    }
-
-    #[salsa::db]
-    impl SourceDb for TestDb {
-        fn vendored(&self) -> &VendoredFileSystem {
-            &self.vendored
-        }
-
-        fn system(&self) -> &dyn ruff_db::system::System {
-            &self.system
-        }
-
-        fn files(&self) -> &Files {
-            &self.files
-        }
-
-        fn python_version(&self) -> PythonVersion {
-            self.python_version
-        }
-    }
-
-    #[salsa::db]
-    impl Db for TestDb {
-        fn search_paths(&self) -> &SearchPaths {
-            &self.search_paths
-        }
-    }
-
-    #[salsa::db]
-    impl salsa::Database for TestDb {}
-}
--- a/crates/ty_module_resolver/src/settings.rs
+++ b/crates/ty_module_resolver/src/settings.rs
@@ -1,105 +0,0 @@
-//! Search path configuration settings.
-
-use ruff_db::system::{System, SystemPathBuf};
-use ruff_db::vendored::VendoredFileSystem;
-
-use crate::path::SearchPathError;
-use crate::resolve::SearchPaths;
-use crate::typeshed::TypeshedVersionsParseError;
-
-/// How to handle apparent misconfiguration
-#[derive(PartialEq, Eq, Debug, Copy, Clone, Default, get_size2::GetSize)]
-pub enum MisconfigurationMode {
-    /// Settings Failure Is Not An Error.
-    ///
-    /// This is used by the default database, which we are incentivized to make infallible,
-    /// while still trying to "do our best" to set things up properly where we can.
-    UseDefault,
-    /// Settings Failure Is An Error.
-    #[default]
-    Fail,
-}
-
-/// Configures the search paths for module resolution.
-#[derive(Eq, PartialEq, Debug, Clone)]
-pub struct SearchPathSettings {
-    /// List of user-provided paths that should take first priority in the module resolution.
-    /// Examples in other type checkers are mypy's MYPYPATH environment variable,
-    /// or pyright's stubPath configuration setting.
-    pub extra_paths: Vec<SystemPathBuf>,
-
-    /// The root of the project, used for finding first-party modules.
-    pub src_roots: Vec<SystemPathBuf>,
-
-    /// Optional path to a "custom typeshed" directory on disk for us to use for standard-library types.
-    /// If this is not provided, we will fallback to our vendored typeshed stubs for the stdlib,
-    /// bundled as a zip file in the binary
-    pub custom_typeshed: Option<SystemPathBuf>,
-
-    /// List of site packages paths to use.
-    pub site_packages_paths: Vec<SystemPathBuf>,
-
-    /// Option path to the real stdlib on the system, and not some instance of typeshed.
-    ///
-    /// We should ideally only ever use this for things like goto-definition,
-    /// where typeshed isn't the right answer.
-    pub real_stdlib_path: Option<SystemPathBuf>,
-
-    /// How to handle apparent misconfiguration
-    pub misconfiguration_mode: MisconfigurationMode,
-}
-
-impl SearchPathSettings {
-    pub fn new(src_roots: Vec<SystemPathBuf>) -> Self {
-        Self {
-            src_roots,
-            ..SearchPathSettings::empty()
-        }
-    }
-
-    pub fn empty() -> Self {
-        SearchPathSettings {
-            src_roots: vec![],
-            extra_paths: vec![],
-            custom_typeshed: None,
-            site_packages_paths: vec![],
-            real_stdlib_path: None,
-            misconfiguration_mode: MisconfigurationMode::Fail,
-        }
-    }
-
-    pub fn to_search_paths(
-        &self,
-        system: &dyn System,
-        vendored: &VendoredFileSystem,
-    ) -> Result<SearchPaths, SearchPathSettingsError> {
-        SearchPaths::from_settings(self, system, vendored)
-    }
-}
-
-/// Enumeration describing the various ways in which validation of the search paths options might fail.
-///
-/// If validation fails for a search path derived from the user settings,
-/// a message must be displayed to the user,
-/// as type checking cannot be done reliably in these circumstances.
-#[derive(Debug, thiserror::Error)]
-pub enum SearchPathSettingsError {
-    #[error(transparent)]
-    InvalidSearchPath(#[from] SearchPathError),
-
-    /// The typeshed path provided by the user is a directory,
-    /// but `stdlib/VERSIONS` could not be read.
-    /// (This is only relevant for stdlib search paths.)
-    #[error("Failed to read the custom typeshed versions file '{path}'")]
-    FailedToReadVersionsFile {
-        path: SystemPathBuf,
-        #[source]
-        error: std::io::Error,
-    },
-
-    /// The path provided by the user is a directory,
-    /// and a `stdlib/VERSIONS` file exists, but it fails to parse.
-    /// (This is only relevant for stdlib search paths.)
-    #[error(transparent)]
-    VersionsParseError(#[from] TypeshedVersionsParseError),
-}
--- a/crates/ty_project/Cargo.toml
+++ b/crates/ty_project/Cargo.toml
@@ -21,9 +21,7 @@ ruff_python_ast = { workspace = true, features = ["serde"] }
 ruff_python_formatter = { workspace = true, optional = true }
 ruff_text_size = { workspace = true }
 ty_combine = { workspace = true }
-ty_module_resolver = { workspace = true }
 ty_python_semantic = { workspace = true, features = ["serde"] }
-ty_python_types = { workspace = true }
 ty_static = { workspace = true }
 ty_vendored = { workspace = true }

--- a/crates/ty_project/src/db.rs
+++ b/crates/ty_project/src/db.rs
@@ -14,9 +14,8 @@ use ruff_db::files::{File, Files};
 use ruff_db::system::System;
 use ruff_db::vendored::VendoredFileSystem;
 use salsa::{Database, Event, Setter};
-use ty_module_resolver::SearchPaths;
 use ty_python_semantic::lint::{LintRegistry, RuleSelection};
-use ty_python_semantic::{AnalysisSettings, Db as SemanticDb, Program};
+use ty_python_semantic::{Db as SemanticDb, Program};

 mod changes;

@@ -447,13 +446,6 @@ impl SalsaMemoryDump {
    }
 }

-#[salsa::db]
-impl ty_module_resolver::Db for ProjectDatabase {
-    fn search_paths(&self) -> &SearchPaths {
-        Program::get(self).search_paths(self)
-    }
-}
-
 #[salsa::db]
 impl SemanticDb for ProjectDatabase {
    fn should_check_file(&self, file: File) -> bool {
@@ -467,11 +459,7 @@ impl SemanticDb for ProjectDatabase {
    }

    fn lint_registry(&self) -> &LintRegistry {
-        ty_python_types::default_lint_registry()
-    }
-
-    fn analysis_settings(&self) -> &AnalysisSettings {
-        self.project().settings(self).analysis()
+        ty_python_semantic::default_lint_registry()
    }

    fn verbose(&self) -> bool {
@@ -535,10 +523,9 @@ pub(crate) mod tests {
    use ruff_db::files::{FileRootKind, Files};
    use ruff_db::system::{DbWithTestSystem, System, TestSystem};
    use ruff_db::vendored::VendoredFileSystem;
-    use ty_module_resolver::SearchPathSettings;
    use ty_python_semantic::lint::{LintRegistry, RuleSelection};
    use ty_python_semantic::{
-        AnalysisSettings, Program, ProgramSettings, PythonPlatform, PythonVersionWithSource,
+        Program, ProgramSettings, PythonPlatform, PythonVersionWithSource, SearchPathSettings,
    };

    use crate::db::Db;
@@ -640,13 +627,6 @@ pub(crate) mod tests {
        }
    }

-    #[salsa::db]
-    impl ty_module_resolver::Db for TestDb {
-        fn search_paths(&self) -> &ty_module_resolver::SearchPaths {
-            Program::get(self).search_paths(self)
-        }
-    }
-
    #[salsa::db]
    impl ty_python_semantic::Db for TestDb {
        fn should_check_file(&self, file: ruff_db::files::File) -> bool {
@@ -658,11 +638,7 @@ pub(crate) mod tests {
        }

        fn lint_registry(&self) -> &LintRegistry {
-            ty_python_types::default_lint_registry()
-        }
-
-        fn analysis_settings(&self) -> &AnalysisSettings {
-            self.project().settings(self).analysis()
+            ty_python_semantic::default_lint_registry()
        }

        fn verbose(&self) -> bool {
--- a/crates/ty_project/src/db/changes.rs
+++ b/crates/ty_project/src/db/changes.rs
@@ -245,9 +245,7 @@ impl ProjectDatabase {

        if result.project_changed {
            let new_project_metadata = match config_file_override {
-                Some(config_file) => {
-                    ProjectMetadata::from_config_file(config_file, &project_root, self.system())
-                }
+                Some(config_file) => ProjectMetadata::from_config_file(config_file, self.system()),
                None => ProjectMetadata::discover(&project_root, self.system()),
            };
            match new_project_metadata {
--- a/crates/ty_project/src/lib.rs
+++ b/crates/ty_project/src/lib.rs
@@ -29,7 +29,7 @@ use std::sync::Arc;
 use thiserror::Error;
 use ty_python_semantic::add_inferred_python_version_hint_to_diagnostic;
 use ty_python_semantic::lint::RuleSelection;
-use ty_python_types::types::check_types;
+use ty_python_semantic::types::check_types;

 mod db;
 mod files;
@@ -769,7 +769,7 @@ mod tests {
    use ruff_db::system::{DbWithTestSystem, DbWithWritableSystem as _, SystemPath, SystemPathBuf};
    use ruff_db::testing::assert_function_query_was_not_run;
    use ruff_python_ast::name::Name;
-    use ty_python_types::types::check_types;
+    use ty_python_semantic::types::check_types;

    #[test]
    fn check_file_skips_type_checking_when_file_cant_be_read() -> ruff_db::system::Result<()> {
--- a/crates/ty_project/src/metadata.rs
+++ b/crates/ty_project/src/metadata.rs
@@ -56,7 +56,6 @@ impl ProjectMetadata {

    pub fn from_config_file(
        path: SystemPathBuf,
-        root: &SystemPath,
        system: &dyn System,
    ) -> Result<Self, ProjectMetadataError> {
        tracing::debug!("Using overridden configuration file at '{path}'");
@@ -71,8 +70,8 @@ impl ProjectMetadata {
        let options = config_file.into_options();

        Ok(Self {
-            name: Name::new(root.file_name().unwrap_or("root")),
-            root: root.to_path_buf(),
+            name: Name::new(system.current_directory().file_name().unwrap_or("root")),
+            root: system.current_directory().to_path_buf(),
            options,
            extra_configuration_paths: vec![path],
            misconfiguration_mode: MisconfigurationMode::Fail,
--- a/crates/ty_project/src/metadata/options.rs
+++ b/crates/ty_project/src/metadata/options.rs
@@ -28,12 +28,11 @@ use std::ops::Deref;
 use std::sync::Arc;
 use thiserror::Error;
 use ty_combine::Combine;
-use ty_module_resolver::{SearchPathSettings, SearchPathSettingsError, SearchPaths};
 use ty_python_semantic::lint::{Level, LintSource, RuleSelection};
 use ty_python_semantic::{
-    AnalysisSettings, MisconfigurationMode, ProgramSettings, PythonEnvironment, PythonPlatform,
-    PythonVersionFileSource, PythonVersionSource, PythonVersionWithSource, SitePackagesPaths,
-    SysPrefixPathOrigin,
+    MisconfigurationMode, ProgramSettings, PythonEnvironment, PythonPlatform,
+    PythonVersionFileSource, PythonVersionSource, PythonVersionWithSource, SearchPathSettings,
+    SearchPathValidationError, SearchPaths, SitePackagesPaths, SysPrefixPathOrigin,
 };
 use ty_static::EnvVars;

@@ -87,10 +86,6 @@ pub struct Options {
    #[option_group]
    pub terminal: Option<TerminalOptions>,

-    #[serde(skip_serializing_if = "Option::is_none")]
-    #[option_group]
-    pub analysis: Option<AnalysisOptions>,
-
    /// Override configurations for specific file patterns.
    ///
    /// Each override specifies include/exclude patterns and rule configurations
@@ -263,7 +258,7 @@ impl Options {
        system: &dyn System,
        vendored: &VendoredFileSystem,
        misconfiguration_mode: MisconfigurationMode,
-    ) -> Result<SearchPaths, SearchPathSettingsError> {
+    ) -> Result<SearchPaths, SearchPathValidationError> {
        let environment = self.environment.or_default();
        let src = self.src.or_default();

@@ -439,8 +434,6 @@ impl Options {
                color: colored::control::SHOULD_COLORIZE.should_colorize(),
            })?;

-        let analysis = self.analysis.or_default().to_settings();
-
        let overrides = self
            .to_overrides_settings(db, project_root, &mut diagnostics)
            .map_err(|err| ToSettingsError {
@@ -453,7 +446,6 @@ impl Options {
            rules: Arc::new(rules),
            terminal,
            src,
-            analysis,
            overrides,
        };

@@ -883,7 +875,10 @@ impl Rules {
                    let lint_source = match source {
                        ValueSource::File(_) => LintSource::File,
                        ValueSource::Cli => LintSource::Cli,
-                        ValueSource::Editor => LintSource::Editor,
+
+                        ValueSource::Editor => {
+                            unreachable!("Can't configure rules from the user's editor")
+                        }
                    };
                    if let Ok(severity) = Severity::try_from(**level) {
                        selection.enable(lint, severity, lint_source);
@@ -1019,12 +1014,7 @@ fn build_include_filter(
                            SubDiagnosticSeverity::Info,
                            "The pattern was specified on the CLI",
                        )),
-                        ValueSource::Editor => {
-                            diagnostic.sub(SubDiagnostic::new(
-                                SubDiagnosticSeverity::Info,
-                                "The pattern was specified in the editor settings.",
-                            ))
-                        }
+                        ValueSource::Editor => unreachable!("Can't configure includes from the user's editor"),
                    }
                })?;
        }
@@ -1107,10 +1097,9 @@ fn build_exclude_filter(
                            SubDiagnosticSeverity::Info,
                            "The pattern was specified on the CLI",
                        )),
-                        ValueSource::Editor => diagnostic.sub(SubDiagnostic::new(
-                            SubDiagnosticSeverity::Info,
-                            "The pattern was specified in the editor settings",
-                        ))
+                        ValueSource::Editor => unreachable!(
+                            "Can't configure excludes from the user's editor"
+                        )
                    }
                })?;
        }
@@ -1261,55 +1250,6 @@ pub struct TerminalOptions {
    pub error_on_warning: Option<bool>,
 }

-#[derive(
-    Debug,
-    Default,
-    Clone,
-    Eq,
-    PartialEq,
-    Combine,
-    Serialize,
-    Deserialize,
-    OptionsMetadata,
-    get_size2::GetSize,
-)]
-#[serde(rename_all = "kebab-case", deny_unknown_fields)]
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-pub struct AnalysisOptions {
-    /// Whether ty should respect `type: ignore` comments.
-    ///
-    /// When set to `false`, `type: ignore` comments are treated like any other normal
-    /// comment and can't be used to suppress ty errors (you have to use `ty: ignore` instead).
-    ///
-    /// Setting this option can be useful when using ty alongside other type checkers or when
-    /// you prefer using `ty: ignore` over `type: ignore`.
-    ///
-    /// Defaults to `true`.
-    #[option(
-        default = r#"true"#,
-        value_type = "bool",
-        example = r#"
-        # Disable support for `type: ignore` comments
-        respect-type-ignore-comments = false
-        "#
-    )]
-    respect_type_ignore_comments: Option<bool>,
-}
-
-impl AnalysisOptions {
-    fn to_settings(&self) -> AnalysisSettings {
-        let AnalysisSettings {
-            respect_type_ignore_comments: respect_type_ignore_default,
-        } = AnalysisSettings::default();
-
-        AnalysisSettings {
-            respect_type_ignore_comments: self
-                .respect_type_ignore_comments
-                .unwrap_or(respect_type_ignore_default),
-        }
-    }
-}
-
 /// Configuration override that applies to specific files based on glob patterns.
 ///
 /// An override allows you to apply different rule configurations to specific
@@ -1666,7 +1606,7 @@ mod schema {
        fn json_schema(generator: &mut schemars::SchemaGenerator) -> schemars::Schema {
            use serde_json::{Map, Value};

-            let registry = ty_python_types::default_lint_registry();
+            let registry = ty_python_semantic::default_lint_registry();
            let level_schema = generator.subschema_for::<super::Level>();

            let properties: Map<String, Value> = registry
--- a/crates/ty_project/src/metadata/settings.rs
+++ b/crates/ty_project/src/metadata/settings.rs
@@ -2,7 +2,6 @@ use std::sync::Arc;

 use ruff_db::files::File;
 use ty_combine::Combine;
-use ty_python_semantic::AnalysisSettings;
 use ty_python_semantic::lint::RuleSelection;

 use crate::metadata::options::{InnerOverrideOptions, OutputFormat};
@@ -26,7 +25,6 @@ pub struct Settings {
    pub(super) rules: Arc<RuleSelection>,
    pub(super) terminal: TerminalSettings,
    pub(super) src: SrcSettings,
-    pub(super) analysis: AnalysisSettings,

    /// Settings for configuration overrides that apply to specific file patterns.
    ///
@@ -56,10 +54,6 @@ impl Settings {
    pub fn overrides(&self) -> &[Override] {
        &self.overrides
    }
-
-    pub fn analysis(&self) -> &AnalysisSettings {
-        &self.analysis
-    }
 }

 #[derive(Debug, Clone, PartialEq, Eq, Default, get_size2::GetSize)]
--- a/crates/ty_project/src/watch/project_watcher.rs
+++ b/crates/ty_project/src/watch/project_watcher.rs
@@ -5,7 +5,7 @@ use tracing::info;

 use ruff_cache::{CacheKey, CacheKeyHasher};
 use ruff_db::system::{SystemPath, SystemPathBuf};
-use ty_module_resolver::system_module_search_paths;
+use ty_python_semantic::system_module_search_paths;

 use crate::db::{Db, ProjectDatabase};
 use crate::watch::Watcher;
--- a/crates/ty_python_semantic/Cargo.toml
+++ b/crates/ty_python_semantic/Cargo.toml
@@ -19,11 +19,11 @@ ruff_macros = { workspace = true }
 ruff_memory_usage = { workspace = true }
 ruff_python_ast = { workspace = true, features = ["salsa"] }
 ruff_python_parser = { workspace = true }
+ruff_python_stdlib = { workspace = true }
 ruff_source_file = { workspace = true }
 ruff_text_size = { workspace = true }
+ruff_python_literal = { workspace = true }
 ruff_python_trivia = { workspace = true }
-ty_module_resolver = { workspace = true }
-ty_combine = { workspace = true }
 ty_static = { workspace = true }

 anyhow = { workspace = true }
@@ -31,6 +31,8 @@ bitflags = { workspace = true }
 bitvec = { workspace = true }
 camino = { workspace = true }
 colored = { workspace = true }
+compact_str = { workspace = true }
+drop_bomb = { workspace = true }
 get-size2 = { workspace = true, features = ["indexmap", "ordermap"] }
 indexmap = { workspace = true }
 itertools = { workspace = true }
@@ -44,8 +46,9 @@ schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
 smallvec = { workspace = true }
-ty_vendored = { workspace = true, optional = true }
 static_assertions = { workspace = true }
+test-case = { workspace = true }
+memchr = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
 strsim = "0.11.1"
@@ -53,19 +56,29 @@ strsim = "0.11.1"
 [dev-dependencies]
 ruff_db = { workspace = true, features = ["testing", "os"] }
 ruff_python_parser = { workspace = true }
+ty_python_semantic = { workspace = true, features = ["testing"] }
+ty_static = { workspace = true }
+ty_test = { workspace = true }
 ty_vendored = { workspace = true }
+
+anyhow = { workspace = true }
+datatest-stable = { workspace = true }
+glob = { workspace = true }
+indoc = { workspace = true }
 insta = { workspace = true }
+pretty_assertions = { workspace = true }
+tempfile = { workspace = true }
 quickcheck = { version = "1.0.3", default-features = false }
 quickcheck_macros = { version = "1.0.0" }

 [features]
 schemars = ["dep:schemars", "dep:serde_json"]
 serde = ["ruff_db/serde", "dep:serde", "ruff_python_ast/serde"]
-testing = ["dep:ty_vendored", "ruff_db/testing"]
+testing = []
+
+[[test]]
+name = "mdtest"
+harness = false

 [lints]
 workspace = true
-
-[package.metadata.cargo-shear]
-# Used via macro expansion.
-ignored = ["quickcheck"]
--- a/crates/ty_python_semantic/resources/README.md
+++ b/crates/ty_python_semantic/resources/README.md
--- a/crates/ty_python_semantic/resources/corpus/00_const.py
+++ b/crates/ty_python_semantic/resources/corpus/00_const.py
--- a/crates/ty_python_semantic/resources/corpus/00_empty.py
+++ b/crates/ty_python_semantic/resources/corpus/00_empty.py
--- a/crates/ty_python_semantic/resources/corpus/00_expr_discard.py
+++ b/crates/ty_python_semantic/resources/corpus/00_expr_discard.py
--- a/crates/ty_python_semantic/resources/corpus/00_expr_var1.py
+++ b/crates/ty_python_semantic/resources/corpus/00_expr_var1.py
--- a/crates/ty_python_semantic/resources/corpus/01_expr_unary.py
+++ b/crates/ty_python_semantic/resources/corpus/01_expr_unary.py
--- a/crates/ty_python_semantic/resources/corpus/02_expr_attr.py
+++ b/crates/ty_python_semantic/resources/corpus/02_expr_attr.py
--- a/crates/ty_python_semantic/resources/corpus/02_expr_attr_multiline.py
+++ b/crates/ty_python_semantic/resources/corpus/02_expr_attr_multiline.py
--- a/crates/ty_python_semantic/resources/corpus/02_expr_attr_multiline_assign.py
+++ b/crates/ty_python_semantic/resources/corpus/02_expr_attr_multiline_assign.py
--- a/crates/ty_python_semantic/resources/corpus/02_expr_bin_bool.py
+++ b/crates/ty_python_semantic/resources/corpus/02_expr_bin_bool.py
--- a/crates/ty_python_semantic/resources/corpus/02_expr_binary.py
+++ b/crates/ty_python_semantic/resources/corpus/02_expr_binary.py
--- a/crates/ty_python_semantic/resources/corpus/02_expr_bool_op_multiline.py
+++ b/crates/ty_python_semantic/resources/corpus/02_expr_bool_op_multiline.py
--- a/crates/ty_python_semantic/resources/corpus/02_expr_bool_op_multiline2.py
+++ b/crates/ty_python_semantic/resources/corpus/02_expr_bool_op_multiline2.py
--- a/crates/ty_python_semantic/resources/corpus/02_expr_rel.py
+++ b/crates/ty_python_semantic/resources/corpus/02_expr_rel.py
--- a/crates/ty_python_semantic/resources/corpus/02_expr_rel_multiple.py
+++ b/crates/ty_python_semantic/resources/corpus/02_expr_rel_multiple.py
--- a/crates/ty_python_semantic/resources/corpus/02_expr_subscr.py
+++ b/crates/ty_python_semantic/resources/corpus/02_expr_subscr.py
--- a/crates/ty_python_semantic/resources/corpus/03_dict.py
+++ b/crates/ty_python_semantic/resources/corpus/03_dict.py
--- a/crates/ty_python_semantic/resources/corpus/03_dict_ex.py
+++ b/crates/ty_python_semantic/resources/corpus/03_dict_ex.py
--- a/crates/ty_python_semantic/resources/corpus/03_dict_literal_large.py
+++ b/crates/ty_python_semantic/resources/corpus/03_dict_literal_large.py
--- a/crates/ty_python_semantic/resources/corpus/03_dict_unpack_huge.py
+++ b/crates/ty_python_semantic/resources/corpus/03_dict_unpack_huge.py
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zanie Blue	6c2d87ed80	Invert case	2025-12-20 22:31:37 -06:00
Zanie Blue	7d4831597b	Lint	2025-12-20 22:31:37 -06:00
Zanie Blue	81f39680d2	[ty] Cache `Type::is_disjoint_from`	2025-12-20 22:31:37 -06:00
Zanie Blue	3c2f534480	[ty] Cache `Type::is_subtype_of`	2025-12-20 22:31:37 -06:00
Zanie Blue	592a674447	[ty] Cache `ClassType::nearest_disjoint_base`	2025-12-20 22:31:37 -06:00