Avoid declarations in exception control flow

[red-knot] mdtest: python version requirements (#14954 )
## Summary This is not strictly required yet, but makes these tests future-proof. They need a `python-version` requirement as they rely on language features that are not available in 3.9.
2024-12-13 18:17:50 +05:30 · 2024-12-13 10:40:38 +01:00 · 2024-12-13 10:38:07 +01:00 · 2024-12-13 09:24:48 +00:00 · 2024-12-13 09:10:01 +00:00 · 2024-12-13 09:07:27 +00:00
712 changed files with 28253 additions and 7657 deletions
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -40,6 +40,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          submodules: recursive
+          persist-credentials: false
      - uses: actions/setup-python@v5
        with:
          python-version: ${{ env.PYTHON_VERSION }}
@@ -52,9 +53,9 @@ jobs:
          args: --out dist
      - name: "Test sdist"
        run: |
-          pip install dist/${{ env.PACKAGE_NAME }}-*.tar.gz --force-reinstall
-          ${{ env.MODULE_NAME }} --help
-          python -m ${{ env.MODULE_NAME }} --help
+          pip install dist/${PACKAGE_NAME}-*.tar.gz --force-reinstall
+          "${MODULE_NAME}" --help
+          python -m "${MODULE_NAME}" --help
      - name: "Upload sdist"
        uses: actions/upload-artifact@v4
        with:
@@ -68,6 +69,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          submodules: recursive
+          persist-credentials: false
      - uses: actions/setup-python@v5
        with:
          python-version: ${{ env.PYTHON_VERSION }}
@@ -109,6 +111,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          submodules: recursive
+          persist-credentials: false
      - uses: actions/setup-python@v5
        with:
          python-version: ${{ env.PYTHON_VERSION }}
@@ -122,7 +125,7 @@ jobs:
          args: --release --locked --out dist
      - name: "Test wheel - aarch64"
        run: |
-          pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
+          pip install dist/${PACKAGE_NAME}-*.whl --force-reinstall
          ruff --help
          python -m ruff --help
      - name: "Upload wheels"
@@ -164,6 +167,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          submodules: recursive
+          persist-credentials: false
      - uses: actions/setup-python@v5
        with:
          python-version: ${{ env.PYTHON_VERSION }}
@@ -182,9 +186,9 @@ jobs:
        if: ${{ !startsWith(matrix.platform.target, 'aarch64') }}
        shell: bash
        run: |
-          python -m pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-          ${{ env.MODULE_NAME }} --help
-          python -m ${{ env.MODULE_NAME }} --help
+          python -m pip install dist/${PACKAGE_NAME}-*.whl --force-reinstall
+          "${MODULE_NAME}" --help
+          python -m "${MODULE_NAME}" --help
      - name: "Upload wheels"
        uses: actions/upload-artifact@v4
        with:
@@ -216,6 +220,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          submodules: recursive
+          persist-credentials: false
      - uses: actions/setup-python@v5
        with:
          python-version: ${{ env.PYTHON_VERSION }}
@@ -231,9 +236,9 @@ jobs:
      - name: "Test wheel"
        if: ${{ startsWith(matrix.target, 'x86_64') }}
        run: |
-          pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
-          ${{ env.MODULE_NAME }} --help
-          python -m ${{ env.MODULE_NAME }} --help
+          pip install dist/${PACKAGE_NAME}-*.whl --force-reinstall
+          "${MODULE_NAME}" --help
+          python -m "${MODULE_NAME}" --help
      - name: "Upload wheels"
        uses: actions/upload-artifact@v4
        with:
@@ -290,6 +295,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          submodules: recursive
+          persist-credentials: false
      - uses: actions/setup-python@v5
        with:
          python-version: ${{ env.PYTHON_VERSION }}
@@ -354,6 +360,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          submodules: recursive
+          persist-credentials: false
      - uses: actions/setup-python@v5
        with:
          python-version: ${{ env.PYTHON_VERSION }}
@@ -419,6 +426,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          submodules: recursive
+          persist-credentials: false
      - uses: actions/setup-python@v5
        with:
          python-version: ${{ env.PYTHON_VERSION }}
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -36,6 +36,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          submodules: recursive
+          persist-credentials: false

      - uses: docker/setup-buildx-action@v3

@@ -71,7 +72,7 @@ jobs:
      - name: Normalize Platform Pair (replace / with -)
        run: |
          platform=${{ matrix.platform }}
-          echo "PLATFORM_TUPLE=${platform//\//-}" >> $GITHUB_ENV
+          echo "PLATFORM_TUPLE=${platform//\//-}" >> "$GITHUB_ENV"

      # Adapted from https://docs.docker.com/build/ci/github-actions/multi-platform/
      - name: Build and push by digest
@@ -86,9 +87,10 @@ jobs:
          outputs: type=image,name=${{ env.RUFF_BASE_IMG }},push-by-digest=true,name-canonical=true,push=${{ inputs.plan != '' && !fromJson(inputs.plan).announcement_tag_is_implicit }}

      - name: Export digests
+        env:
+          digest: ${{ steps.build.outputs.digest }}
        run: |
          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
          touch "/tmp/digests/${digest#sha256:}"

      - name: Upload digests
@@ -142,7 +144,7 @@ jobs:
        run: |
          docker buildx imagetools create \
            $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.RUFF_BASE_IMG }}@sha256:%s ' *)
+            $(printf "${RUFF_BASE_IMG}@sha256:%s " *)

  docker-publish-extra:
    name: Publish additional Docker image based on ${{ matrix.image-mapping }}
@@ -181,7 +183,7 @@ jobs:
          # Generate Dockerfile content
          cat <<EOF > Dockerfile
          FROM ${BASE_IMAGE}
-          COPY --from=${{ env.RUFF_BASE_IMG }}:latest /ruff /usr/local/bin/ruff
+          COPY --from=${RUFF_BASE_IMG}:latest /ruff /usr/local/bin/ruff
          ENTRYPOINT []
          CMD ["/usr/local/bin/ruff"]
          EOF
@@ -201,14 +203,14 @@ jobs:
          TAG_PATTERNS="${TAG_PATTERNS%\\n}"

          # Export image cache name
-          echo "IMAGE_REF=${BASE_IMAGE//:/-}" >> $GITHUB_ENV
+          echo "IMAGE_REF=${BASE_IMAGE//:/-}" >> "$GITHUB_ENV"

          # Export tag patterns using the multiline env var syntax
          {
            echo "TAG_PATTERNS<<EOF"
            echo -e "${TAG_PATTERNS}"
            echo EOF
-          } >> $GITHUB_ENV
+          } >> "$GITHUB_ENV"

      - name: Extract metadata (tags, labels) for Docker
        id: meta
@@ -287,4 +289,4 @@ jobs:
          docker buildx imagetools create \
            "${annotations[@]}" \
            $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.RUFF_BASE_IMG }}@sha256:%s ' *)
+            $(printf "${RUFF_BASE_IMG}@sha256:%s " *)
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -32,10 +32,13 @@ jobs:
      # Flag that is raised when any code is changed
      # This is superset of the linter and formatter
      code: ${{ steps.changed.outputs.code_any_changed }}
+      # Flag that is raised when any code that affects the fuzzer is changed
+      fuzz: ${{ steps.changed.outputs.fuzz_any_changed }}
    steps:
      - uses: actions/checkout@v4
        with:
          fetch-depth: 0
+          persist-credentials: false

      - uses: tj-actions/changed-files@v45
        id: changed
@@ -79,6 +82,11 @@ jobs:
              - python/**
              - .github/workflows/ci.yaml

+            fuzz:
+              - fuzz/Cargo.toml
+              - fuzz/Cargo.lock
+              - fuzz/fuzz_targets/**
+
            code:
              - "**/*"
              - "!**/*.md"
@@ -92,6 +100,8 @@ jobs:
    timeout-minutes: 10
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup component add rustfmt
      - run: cargo fmt --all --check
@@ -104,6 +114,8 @@ jobs:
    timeout-minutes: 20
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - name: "Install Rust toolchain"
        run: |
          rustup component add clippy
@@ -122,6 +134,8 @@ jobs:
    timeout-minutes: 20
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
@@ -166,6 +180,8 @@ jobs:
    timeout-minutes: 20
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
@@ -193,6 +209,8 @@ jobs:
    timeout-minutes: 20
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install cargo nextest"
@@ -217,6 +235,8 @@ jobs:
    timeout-minutes: 10
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
      - uses: actions/setup-node@v4
@@ -244,6 +264,8 @@ jobs:
    timeout-minutes: 20
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Install mold"
@@ -260,6 +282,8 @@ jobs:
    timeout-minutes: 20
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - uses: SebRollen/toml-action@v1.2.0
        id: msrv
        with:
@@ -288,10 +312,12 @@ jobs:
    name: "cargo fuzz build"
    runs-on: ubuntu-latest
    needs: determine_changes
-    if: ${{ github.ref == 'refs/heads/main' }}
+    if: ${{ github.ref == 'refs/heads/main' || needs.determine_changes.outputs.fuzz == 'true' || needs.determine_changes.outputs.code == 'true' }}
    timeout-minutes: 10
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup show
      - uses: Swatinem/rust-cache@v2
@@ -318,6 +344,8 @@ jobs:
      FORCE_COLOR: 1
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - uses: astral-sh/setup-uv@v4
      - uses: actions/download-artifact@v4
        name: Download Ruff binary to test
@@ -348,6 +376,8 @@ jobs:
    timeout-minutes: 5
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup component add rustfmt
      - uses: Swatinem/rust-cache@v2
@@ -372,6 +402,8 @@ jobs:
    timeout-minutes: 20
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - uses: actions/setup-python@v5
        with:
          python-version: ${{ env.PYTHON_VERSION }}
@@ -383,7 +415,7 @@ jobs:
          name: ruff
          path: target/debug

-      - uses: dawidd6/action-download-artifact@v6
+      - uses: dawidd6/action-download-artifact@v7
        name: Download baseline Ruff binary
        with:
          name: ruff
@@ -482,6 +514,8 @@ jobs:
    if: ${{ needs.determine_changes.outputs.code == 'true' || github.ref == 'refs/heads/main' }}
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - uses: cargo-bins/cargo-binstall@main
      - run: cargo binstall --no-confirm cargo-shear
      - run: cargo shear
@@ -492,6 +526,8 @@ jobs:
    timeout-minutes: 20
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - uses: actions/setup-python@v5
        with:
          python-version: ${{ env.PYTHON_VERSION }}
@@ -517,6 +553,8 @@ jobs:
    timeout-minutes: 10
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - uses: actions/setup-python@v5
        with:
          python-version: ${{ env.PYTHON_VERSION }}
@@ -548,6 +586,8 @@ jobs:
      MKDOCS_INSIDERS_SSH_KEY_EXISTS: ${{ secrets.MKDOCS_INSIDERS_SSH_KEY != '' }}
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - uses: actions/setup-python@v5
        with:
          python-version: "3.13"
@@ -559,7 +599,7 @@ jobs:
      - name: "Install Rust toolchain"
        run: rustup show
      - name: Install uv
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v4
      - uses: Swatinem/rust-cache@v2
      - name: "Install Insiders dependencies"
        if: ${{ env.MKDOCS_INSIDERS_SSH_KEY_EXISTS == 'true' }}
@@ -588,6 +628,8 @@ jobs:
    timeout-minutes: 10
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup show
      - name: "Cache rust"
@@ -615,6 +657,7 @@ jobs:
      - uses: actions/checkout@v4
        name: "Download ruff-lsp source"
        with:
+          persist-credentials: false
          repository: "astral-sh/ruff-lsp"

      - uses: actions/setup-python@v5
@@ -650,6 +693,8 @@ jobs:
    steps:
      - name: "Checkout Branch"
        uses: actions/checkout@v4
+        with:
+          persist-credentials: false

      - name: "Install Rust toolchain"
        run: rustup show
--- a/.github/workflows/daily_fuzz.yaml
+++ b/.github/workflows/daily_fuzz.yaml
@@ -32,6 +32,8 @@ jobs:
    if: ${{ github.repository == 'astral-sh/ruff' || github.event_name != 'schedule' }}
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - uses: astral-sh/setup-uv@v4
      - name: "Install Rust toolchain"
        run: rustup show
--- a/.github/workflows/pr-comment.yaml
+++ b/.github/workflows/pr-comment.yaml
@@ -17,7 +17,7 @@ jobs:
  comment:
    runs-on: ubuntu-latest
    steps:
-      - uses: dawidd6/action-download-artifact@v6
+      - uses: dawidd6/action-download-artifact@v7
        name: Download pull request number
        with:
          name: pr-number
@@ -33,7 +33,7 @@ jobs:
            echo "pr-number=$(<pr-number)" >> $GITHUB_OUTPUT
          fi

-      - uses: dawidd6/action-download-artifact@v6
+      - uses: dawidd6/action-download-artifact@v7
        name: "Download ecosystem results"
        id: download-ecosystem-result
        if: steps.pr-number.outputs.pr-number
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -26,6 +26,7 @@ jobs:
      - uses: actions/checkout@v4
        with:
          ref: ${{ inputs.ref }}
+          persist-credentials: true

      - uses: actions/setup-python@v5
        with:
@@ -48,13 +49,11 @@ jobs:

      - name: "Set branch name"
        run: |
-          version="${{ env.version }}"
-          display_name="${{ env.display_name }}"
          timestamp="$(date +%s)"

          # create branch_display_name from display_name by replacing all
          # characters disallowed in git branch names with hyphens
-          branch_display_name="$(echo "$display_name" | tr -c '[:alnum:]._' '-' | tr -s '-')"
+          branch_display_name="$(echo "${display_name}" | tr -c '[:alnum:]._' '-' | tr -s '-')"

          echo "branch_name=update-docs-$branch_display_name-$timestamp" >> $GITHUB_ENV
          echo "timestamp=$timestamp" >> $GITHUB_ENV
@@ -92,9 +91,7 @@ jobs:
        run: mkdocs build --strict -f mkdocs.public.yml

      - name: "Clone docs repo"
-        run: |
-          version="${{ env.version }}"
-          git clone https://${{ secrets.ASTRAL_DOCS_PAT }}@github.com/astral-sh/docs.git astral-docs
+        run: git clone https://${{ secrets.ASTRAL_DOCS_PAT }}@github.com/astral-sh/docs.git astral-docs

      - name: "Copy docs"
        run: rm -rf astral-docs/site/ruff && mkdir -p astral-docs/site && cp -r site/ruff astral-docs/site/
@@ -102,12 +99,10 @@ jobs:
      - name: "Commit docs"
        working-directory: astral-docs
        run: |
-          branch_name="${{ env.branch_name }}"
-
          git config user.name "astral-docs-bot"
          git config user.email "176161322+astral-docs-bot@users.noreply.github.com"

-          git checkout -b $branch_name
+          git checkout -b "${branch_name}"
          git add site/ruff
          git commit -m "Update ruff documentation for $version"

@@ -116,12 +111,8 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.ASTRAL_DOCS_PAT }}
        run: |
-          version="${{ env.version }}"
-          display_name="${{ env.display_name }}"
-          branch_name="${{ env.branch_name }}"
-
          # set the PR title
-          pull_request_title="Update ruff documentation for $display_name"
+          pull_request_title="Update ruff documentation for "${display_name}""

          # Delete any existing pull requests that are open for this version
          # by checking against pull_request_title because the new PR will
@@ -130,12 +121,12 @@ jobs:
            xargs -I {} gh pr close {}

          # push the branch to GitHub
-          git push origin $branch_name
+          git push origin "${branch_name}"

          # create the PR
-          gh pr create --base main --head $branch_name \
+          gh pr create --base main --head "${branch_name}" \
            --title "$pull_request_title" \
-            --body "Automated documentation update for $display_name" \
+            --body "Automated documentation update for "${display_name}"" \
            --label "documentation"

      - name: "Merge Pull Request"
@@ -144,9 +135,7 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.ASTRAL_DOCS_PAT }}
        run: |
-          branch_name="${{ env.branch_name }}"
-
          # auto-merge the PR if the build was triggered by a release. Manual builds should be reviewed by a human.
          # give the PR a few seconds to be created before trying to auto-merge it
          sleep 10
-          gh pr merge --squash $branch_name
+          gh pr merge --squash "${branch_name}"
--- a/.github/workflows/publish-playground.yml
+++ b/.github/workflows/publish-playground.yml
@@ -25,6 +25,8 @@ jobs:
      CF_API_TOKEN_EXISTS: ${{ secrets.CF_API_TOKEN != '' }}
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
      - uses: actions/setup-node@v4
@@ -47,7 +49,7 @@ jobs:
        working-directory: playground
      - name: "Deploy to Cloudflare Pages"
        if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@v3.12.1
+        uses: cloudflare/wrangler-action@v3.13.0
        with:
          apiToken: ${{ secrets.CF_API_TOKEN }}
          accountId: ${{ secrets.CF_ACCOUNT_ID }}
--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@@ -22,7 +22,7 @@ jobs:
      id-token: write
    steps:
      - name: "Install uv"
-        uses: astral-sh/setup-uv@v3
+        uses: astral-sh/setup-uv@v4
      - uses: actions/download-artifact@v4
        with:
          pattern: wheels-*
--- a/.github/workflows/publish-wasm.yml
+++ b/.github/workflows/publish-wasm.yml
@@ -30,6 +30,8 @@ jobs:
      fail-fast: false
    steps:
      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
      - name: "Install Rust toolchain"
        run: rustup target add wasm32-unknown-unknown
      - uses: jetli/wasm-pack-action@v0.4.0
--- a/.github/workflows/sync_typeshed.yaml
+++ b/.github/workflows/sync_typeshed.yaml
@@ -25,11 +25,13 @@ jobs:
        name: Checkout Ruff
        with:
          path: ruff
+          persist-credentials: true
      - uses: actions/checkout@v4
        name: Checkout typeshed
        with:
          repository: python/typeshed
          path: typeshed
+          persist-credentials: false
      - name: Setup git
        run: |
          git config --global user.name typeshedbot
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
      - id: validate-pyproject

  - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.18
+    rev: 0.7.19
    hooks:
      - id: mdformat
        additional_dependencies:
@@ -36,7 +36,7 @@ repos:
          )$

  - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.42.0
+    rev: v0.43.0
    hooks:
      - id: markdownlint-fix
        exclude: |
@@ -59,7 +59,7 @@ repos:
          - black==24.10.0

  - repo: https://github.com/crate-ci/typos
-    rev: v1.27.3
+    rev: v1.28.2
    hooks:
      - id: typos

@@ -73,7 +73,7 @@ repos:
        pass_filenames: false # This makes it a lot faster

  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.4
+    rev: v0.8.2
    hooks:
      - id: ruff-format
      - id: ruff
@@ -83,10 +83,23 @@ repos:

  # Prettier
  - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.3.3
+    rev: v3.4.2
    hooks:
      - id: prettier
        types: [yaml]

+  - repo: https://github.com/woodruffw/zizmor-pre-commit
+    rev: v0.8.0
+    hooks:
+      - id: zizmor
+        # `release.yml` is autogenerated by `dist`; security issues need to be fixed there
+        # (https://opensource.axo.dev/cargo-dist/)
+        exclude: .github/workflows/release.yml
+
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.30.0
+    hooks:
+      - id: check-github-workflows
+
 ci:
  skip: [cargo-fmt, dev-generate-all]
--- a/BREAKING_CHANGES.md
+++ b/BREAKING_CHANGES.md
@@ -192,7 +192,7 @@ flag or `unsafe-fixes` configuration option can be used to enable unsafe fixes.

 See the [docs](https://docs.astral.sh/ruff/configuration/#fix-safety) for details.

-### Remove formatter-conflicting rules from the default rule set  ([#7900](https://github.com/astral-sh/ruff/pull/7900))
+### Remove formatter-conflicting rules from the default rule set ([#7900](https://github.com/astral-sh/ruff/pull/7900))

 Previously, Ruff enabled all implemented rules in Pycodestyle (`E`) by default. Ruff now only includes the
 Pycodestyle prefixes `E4`, `E7`, and `E9` to exclude rules that conflict with automatic formatters. Consequently,
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,77 @@
 # Changelog

+## 0.8.3
+
+### Preview features
+
+- Fix fstring formatting removing overlong implicit concatenated string in expression part ([#14811](https://github.com/astral-sh/ruff/pull/14811))
+- \[`airflow`\] Add fix to remove deprecated keyword arguments (`AIR302`) ([#14887](https://github.com/astral-sh/ruff/pull/14887))
+- \[`airflow`\]: Extend rule to include deprecated names for Airflow 3.0 (`AIR302`) ([#14765](https://github.com/astral-sh/ruff/pull/14765) and [#14804](https://github.com/astral-sh/ruff/pull/14804))
+- \[`flake8-bugbear`\] Improve error messages for `except*` (`B025`, `B029`, `B030`, `B904`) ([#14815](https://github.com/astral-sh/ruff/pull/14815))
+- \[`flake8-bugbear`\] `itertools.batched()` without explicit `strict` (`B911`) ([#14408](https://github.com/astral-sh/ruff/pull/14408))
+- \[`flake8-use-pathlib`\] Dotless suffix passed to `Path.with_suffix()` (`PTH210`) ([#14779](https://github.com/astral-sh/ruff/pull/14779))
+- \[`pylint`\] Include parentheses and multiple comparators in check for `boolean-chained-comparison` (`PLR1716`) ([#14781](https://github.com/astral-sh/ruff/pull/14781))
+- \[`ruff`\] Do not simplify `round()` calls (`RUF046`) ([#14832](https://github.com/astral-sh/ruff/pull/14832))
+- \[`ruff`\] Don't emit `used-dummy-variable` on function parameters (`RUF052`) ([#14818](https://github.com/astral-sh/ruff/pull/14818))
+- \[`ruff`\] Implement `if-key-in-dict-del` (`RUF051`) ([#14553](https://github.com/astral-sh/ruff/pull/14553))
+- \[`ruff`\] Mark autofix for `RUF052` as always unsafe ([#14824](https://github.com/astral-sh/ruff/pull/14824))
+- \[`ruff`\] Teach autofix for `used-dummy-variable` about TypeVars etc. (`RUF052`) ([#14819](https://github.com/astral-sh/ruff/pull/14819))
+
+### Rule changes
+
+- \[`flake8-bugbear`\] Offer unsafe autofix for `no-explicit-stacklevel` (`B028`) ([#14829](https://github.com/astral-sh/ruff/pull/14829))
+- \[`flake8-pyi`\] Skip all type definitions in `string-or-bytes-too-long` (`PYI053`) ([#14797](https://github.com/astral-sh/ruff/pull/14797))
+- \[`pyupgrade`\] Do not report when a UTF-8 comment is followed by a non-UTF-8 one (`UP009`) ([#14728](https://github.com/astral-sh/ruff/pull/14728))
+- \[`pyupgrade`\] Mark fixes for `convert-typed-dict-functional-to-class` and `convert-named-tuple-functional-to-class` as unsafe if they will remove comments (`UP013`, `UP014`) ([#14842](https://github.com/astral-sh/ruff/pull/14842))
+
+### Bug fixes
+
+- Raise syntax error for mixing `except` and `except*` ([#14895](https://github.com/astral-sh/ruff/pull/14895))
+- \[`flake8-bugbear`\] Fix `B028` to allow `stacklevel` to be explicitly assigned as a positional argument ([#14868](https://github.com/astral-sh/ruff/pull/14868))
+- \[`flake8-bugbear`\] Skip `B028` if `warnings.warn` is called with `*args` or `**kwargs` ([#14870](https://github.com/astral-sh/ruff/pull/14870))
+- \[`flake8-comprehensions`\] Skip iterables with named expressions in `unnecessary-map` (`C417`) ([#14827](https://github.com/astral-sh/ruff/pull/14827))
+- \[`flake8-pyi`\] Also remove `self` and `cls`'s annotation (`PYI034`) ([#14801](https://github.com/astral-sh/ruff/pull/14801))
+- \[`flake8-pytest-style`\] Fix `pytest-parametrize-names-wrong-type` (`PT006`) to edit both `argnames` and `argvalues` if both of them are single-element tuples/lists ([#14699](https://github.com/astral-sh/ruff/pull/14699))
+- \[`perflint`\] Improve autofix for `PERF401` ([#14369](https://github.com/astral-sh/ruff/pull/14369))
+- \[`pylint`\] Fix `PLW1508` false positive for default string created via a mult operation ([#14841](https://github.com/astral-sh/ruff/pull/14841))
+
+## 0.8.2
+
+### Preview features
+
+- \[`airflow`\] Avoid deprecated values (`AIR302`) ([#14582](https://github.com/astral-sh/ruff/pull/14582))
+- \[`airflow`\] Extend removed names for `AIR302` ([#14734](https://github.com/astral-sh/ruff/pull/14734))
+- \[`ruff`\] Extend `unnecessary-regular-expression` to non-literal strings (`RUF055`) ([#14679](https://github.com/astral-sh/ruff/pull/14679))
+- \[`ruff`\] Implement `used-dummy-variable` (`RUF052`) ([#14611](https://github.com/astral-sh/ruff/pull/14611))
+- \[`ruff`\] Implement `unnecessary-cast-to-int` (`RUF046`) ([#14697](https://github.com/astral-sh/ruff/pull/14697))
+
+### Rule changes
+
+- \[`airflow`\] Check `AIR001` from builtin or providers `operators` module ([#14631](https://github.com/astral-sh/ruff/pull/14631))
+- \[`flake8-pytest-style`\] Remove `@` in `pytest.mark.parametrize` rule messages ([#14770](https://github.com/astral-sh/ruff/pull/14770))
+- \[`pandas-vet`\] Skip rules if the `panda` module hasn't been seen ([#14671](https://github.com/astral-sh/ruff/pull/14671))
+- \[`pylint`\] Fix false negatives for `ascii` and `sorted` in `len-as-condition` (`PLC1802`) ([#14692](https://github.com/astral-sh/ruff/pull/14692))
+- \[`refurb`\] Guard `hashlib` imports and mark `hashlib-digest-hex` fix as safe (`FURB181`) ([#14694](https://github.com/astral-sh/ruff/pull/14694))
+
+### Configuration
+
+- \[`flake8-import-conventions`\] Improve syntax check for aliases supplied in configuration for `unconventional-import-alias` (`ICN001`) ([#14745](https://github.com/astral-sh/ruff/pull/14745))
+
+### Bug fixes
+
+- Revert: [pyflakes] Avoid false positives in `@no_type_check` contexts (`F821`, `F722`) (#14615) ([#14726](https://github.com/astral-sh/ruff/pull/14726))
+- \[`pep8-naming`\] Avoid false positive for `class Bar(type(foo))` (`N804`) ([#14683](https://github.com/astral-sh/ruff/pull/14683))
+- \[`pycodestyle`\] Handle f-strings properly for `invalid-escape-sequence` (`W605`) ([#14748](https://github.com/astral-sh/ruff/pull/14748))
+- \[`pylint`\] Ignore `@overload` in `PLR0904` ([#14730](https://github.com/astral-sh/ruff/pull/14730))
+- \[`refurb`\] Handle non-finite decimals in `verbose-decimal-constructor` (`FURB157`) ([#14596](https://github.com/astral-sh/ruff/pull/14596))
+- \[`ruff`\] Avoid emitting `assignment-in-assert` when all references to the assigned variable are themselves inside `assert`s (`RUF018`) ([#14661](https://github.com/astral-sh/ruff/pull/14661))
+
+### Documentation
+
+- Improve docs for `flake8-use-pathlib` rules ([#14741](https://github.com/astral-sh/ruff/pull/14741))
+- Improve error messages and docs for `flake8-comprehensions` rules ([#14729](https://github.com/astral-sh/ruff/pull/14729))
+- \[`flake8-type-checking`\] Expands `TC006` docs to better explain itself ([#14749](https://github.com/astral-sh/ruff/pull/14749))
+
 ## 0.8.1

 ### Preview features
@@ -257,7 +329,7 @@ The following fixes have been stabilized:
 ### Preview features

 - Fix `E221` and `E222` to flag missing or extra whitespace around `==` operator ([#13890](https://github.com/astral-sh/ruff/pull/13890))
- Formatter: Alternate quotes for strings inside f-strings in preview  ([#13860](https://github.com/astral-sh/ruff/pull/13860))
+- Formatter: Alternate quotes for strings inside f-strings in preview ([#13860](https://github.com/astral-sh/ruff/pull/13860))
 - Formatter: Join implicit concatenated strings when they fit on a line ([#13663](https://github.com/astral-sh/ruff/pull/13663))
 - \[`pylint`\] Restrict `iteration-over-set` to only work on sets of literals (`PLC0208`) ([#13731](https://github.com/astral-sh/ruff/pull/13731))

@@ -1272,7 +1344,7 @@ To read more about this exciting milestone, check out our [blog post](https://as
 ### Preview features

 - \[`pycodestyle`\] Ignore end-of-line comments when determining blank line rules ([#11342](https://github.com/astral-sh/ruff/pull/11342))
- \[`pylint`\] Detect `pathlib.Path.open` calls in `unspecified-encoding` (`PLW1514`)  ([#11288](https://github.com/astral-sh/ruff/pull/11288))
+- \[`pylint`\] Detect `pathlib.Path.open` calls in `unspecified-encoding` (`PLW1514`) ([#11288](https://github.com/astral-sh/ruff/pull/11288))
 - \[`flake8-pyi`\] Implement `PYI059` (`generic-not-last-base-class`) ([#11233](https://github.com/astral-sh/ruff/pull/11233))
 - \[`flake8-pyi`\] Implement `PYI062` (`duplicate-literal-member`) ([#11269](https://github.com/astral-sh/ruff/pull/11269))

@@ -1647,7 +1719,7 @@ To setup `ruff server` with your editor, refer to the [README.md](https://github
 - \[`pycodestyle`\] Do not ignore lines before the first logical line in blank lines rules. ([#10382](https://github.com/astral-sh/ruff/pull/10382))
 - \[`pycodestyle`\] Do not trigger `E225` and `E275` when the next token is a ')' ([#10315](https://github.com/astral-sh/ruff/pull/10315))
 - \[`pylint`\] Avoid false-positive slot non-assignment for `__dict__` (`PLE0237`) ([#10348](https://github.com/astral-sh/ruff/pull/10348))
- Gate f-string struct size test for Rustc \< 1.76 ([#10371](https://github.com/astral-sh/ruff/pull/10371))
+- Gate f-string struct size test for Rustc < 1.76 ([#10371](https://github.com/astral-sh/ruff/pull/10371))

 ### Documentation

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -863,7 +863,7 @@ each configuration file.

 The package root is used to determine a file's "module path". Consider, again, `baz.py`. In that
 case, `./my_project/src/foo` was identified as the package root, so the module path for `baz.py`
-would resolve to  `foo.bar.baz` — as computed by taking the relative path from the package root
+would resolve to `foo.bar.baz` — as computed by taking the relative path from the package root
 (inclusive of the root itself). The module path can be thought of as "the path you would use to
 import the module" (e.g., `import foo.bar.baz`).

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -117,9 +117,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
+checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"

 [[package]]
 name = "append-only-vec"
@@ -276,13 +276,13 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.0.95"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b"
+checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc"
 dependencies = [
 "jobserver",
 "libc",
- "once_cell",
+ "shlex",
 ]

 [[package]]
@@ -353,9 +353,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.21"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -363,9 +363,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.21"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
 dependencies = [
 "anstream",
 "anstyle",
@@ -413,14 +413,14 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"

 [[package]]
 name = "clearscreen"
@@ -693,7 +693,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "strsim 0.10.0",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -704,7 +704,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
 "darling_core",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -758,23 +758,23 @@ dependencies = [

 [[package]]
 name = "dir-test"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b12781621d53fd9087021f5a338df5c57c04f84a6231c1f4726f45e2e333470b"
+checksum = "62c013fe825864f3e4593f36426c1fa7a74f5603f13ca8d1af7a990c1cd94a79"
 dependencies = [
 "dir-test-macros",
 ]

 [[package]]
 name = "dir-test-macros"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1340852f50b2285d01a7f598cc5d08b572669c3e09e614925175cc3c26787b91"
+checksum = "d42f54d7b4a6bc2400fe5b338e35d1a335787585375322f49c5d5fe7b243da7e"
 dependencies = [
 "glob",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -826,7 +826,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -1246,7 +1246,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -1314,9 +1314,9 @@ dependencies = [

 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
 "equivalent",
 "hashbrown 0.15.2",
@@ -1420,7 +1420,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -1485,10 +1485,11 @@ checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae"

 [[package]]
 name = "js-sys"
-version = "0.3.72"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
+checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705"
 dependencies = [
+ "once_cell",
 "wasm-bindgen",
 ]

@@ -1520,9 +1521,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.164"
+version = "0.2.167"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
+checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"

 [[package]]
 name = "libcst"
@@ -1546,7 +1547,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2ae40017ac09cd2c6a53504cb3c871c7f2b41466eac5bc66ba63f39073b467b"
 dependencies = [
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -1833,9 +1834,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"

 [[package]]
 name = "ordermap"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f2bd7b03bf2c767e1bb7b91505dbe022833776e60480275e6f2fb0db0c7503"
+checksum = "f80a48eb68b6a7da9829b8b0429011708f775af80676a91063d023a66a656106"
 dependencies = [
 "indexmap",
 ]
@@ -1910,9 +1911,9 @@ checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"

 [[package]]
 name = "pathdiff"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361"
+checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"

 [[package]]
 name = "peg"
@@ -1943,10 +1944,11 @@ checksum = "e3aeb8f54c078314c2065ee649a7241f46b9d8e418e1a9581ba0546657d7aa3a"

 [[package]]
 name = "pep440_rs"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0922a442c78611fa8c5ed6065d2d898a820cf12fa90604217fdb2d01675efec7"
+checksum = "31095ca1f396e3de32745f42b20deef7bc09077f918b085307e8eab6ddd8fb9c"
 dependencies = [
+ "once_cell",
 "serde",
 "unicode-width 0.2.0",
 "unscanny",
@@ -1965,7 +1967,7 @@ dependencies = [
 "once_cell",
 "pep440_rs",
 "regex",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "serde",
 "smallvec",
 "thiserror 1.0.67",
@@ -2012,7 +2014,7 @@ dependencies = [
 "pest_meta",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -2159,7 +2161,7 @@ dependencies = [
 "newtype-uuid",
 "quick-xml",
 "strip-ansi-escapes",
- "thiserror 2.0.3",
+ "thiserror 2.0.6",
 "uuid",
 ]

@@ -2172,6 +2174,26 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "quickcheck"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
+dependencies = [
+ "rand",
+]
+
+[[package]]
+name = "quickcheck_macros"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.37"
@@ -2272,24 +2294,27 @@ dependencies = [
 "itertools 0.13.0",
 "memchr",
 "ordermap",
+ "quickcheck",
+ "quickcheck_macros",
 "red_knot_test",
 "red_knot_vendored",
 "ruff_db",
 "ruff_index",
+ "ruff_macros",
 "ruff_python_ast",
 "ruff_python_literal",
 "ruff_python_parser",
 "ruff_python_stdlib",
 "ruff_source_file",
 "ruff_text_size",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "salsa",
 "serde",
 "smallvec",
 "static_assertions",
 "tempfile",
 "test-case",
- "thiserror 2.0.3",
+ "thiserror 2.0.6",
 "tracing",
 ]

@@ -2309,7 +2334,7 @@ dependencies = [
 "ruff_python_ast",
 "ruff_source_file",
 "ruff_text_size",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "serde",
 "serde_json",
 "shellexpand",
@@ -2322,6 +2347,7 @@ name = "red_knot_test"
 version = "0.0.0"
 dependencies = [
 "anyhow",
+ "camino",
 "colored",
 "memchr",
 "red_knot_python_semantic",
@@ -2332,9 +2358,11 @@ dependencies = [
 "ruff_python_trivia",
 "ruff_source_file",
 "ruff_text_size",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "salsa",
+ "serde",
 "smallvec",
+ "toml",
 ]

 [[package]]
@@ -2380,10 +2408,10 @@ dependencies = [
 "ruff_db",
 "ruff_python_ast",
 "ruff_text_size",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "salsa",
 "serde",
- "thiserror 2.0.3",
+ "thiserror 2.0.6",
 "toml",
 "tracing",
 ]
@@ -2489,7 +2517,7 @@ dependencies = [

 [[package]]
 name = "ruff"
-version = "0.8.1"
+version = "0.8.3"
 dependencies = [
 "anyhow",
 "argfile",
@@ -2529,14 +2557,14 @@ dependencies = [
 "ruff_source_file",
 "ruff_text_size",
 "ruff_workspace",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "serde",
 "serde_json",
 "shellexpand",
 "strum",
 "tempfile",
 "test-case",
- "thiserror 2.0.3",
+ "thiserror 2.0.6",
 "tikv-jemallocator",
 "toml",
 "tracing",
@@ -2560,7 +2588,7 @@ dependencies = [
 "ruff_python_formatter",
 "ruff_python_parser",
 "ruff_python_trivia",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "serde",
 "serde_json",
 "tikv-jemallocator",
@@ -2602,11 +2630,11 @@ dependencies = [
 "ruff_python_trivia",
 "ruff_source_file",
 "ruff_text_size",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "salsa",
 "serde",
 "tempfile",
- "thiserror 2.0.3",
+ "thiserror 2.0.6",
 "tracing",
 "tracing-subscriber",
 "tracing-tree",
@@ -2671,7 +2699,7 @@ dependencies = [
 "ruff_cache",
 "ruff_macros",
 "ruff_text_size",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "schemars",
 "serde",
 "static_assertions",
@@ -2708,7 +2736,7 @@ dependencies = [

 [[package]]
 name = "ruff_linter"
-version = "0.8.1"
+version = "0.8.3"
 dependencies = [
 "aho-corasick",
 "annotate-snippets 0.9.2",
@@ -2749,7 +2777,7 @@ dependencies = [
 "ruff_python_trivia",
 "ruff_source_file",
 "ruff_text_size",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "schemars",
 "serde",
 "serde_json",
@@ -2758,7 +2786,7 @@ dependencies = [
 "strum",
 "strum_macros",
 "test-case",
- "thiserror 2.0.3",
+ "thiserror 2.0.6",
 "toml",
 "typed-arena",
 "unicode-normalization",
@@ -2775,7 +2803,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "ruff_python_trivia",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -2792,7 +2820,7 @@ dependencies = [
 "serde_json",
 "serde_with",
 "test-case",
- "thiserror 2.0.3",
+ "thiserror 2.0.6",
 "uuid",
 ]

@@ -2811,7 +2839,7 @@ dependencies = [
 "ruff_python_trivia",
 "ruff_source_file",
 "ruff_text_size",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "schemars",
 "serde",
 ]
@@ -2857,14 +2885,14 @@ dependencies = [
 "ruff_python_trivia",
 "ruff_source_file",
 "ruff_text_size",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "schemars",
 "serde",
 "serde_json",
 "similar",
 "smallvec",
 "static_assertions",
- "thiserror 2.0.3",
+ "thiserror 2.0.6",
 "tracing",
 ]

@@ -2904,7 +2932,7 @@ dependencies = [
 "ruff_python_trivia",
 "ruff_source_file",
 "ruff_text_size",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "static_assertions",
 "unicode-ident",
 "unicode-normalization",
@@ -2935,7 +2963,7 @@ dependencies = [
 "ruff_python_parser",
 "ruff_python_stdlib",
 "ruff_text_size",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "schemars",
 "serde",
 ]
@@ -2993,11 +3021,11 @@ dependencies = [
 "ruff_source_file",
 "ruff_text_size",
 "ruff_workspace",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "serde",
 "serde_json",
 "shellexpand",
- "thiserror 2.0.3",
+ "thiserror 2.0.6",
 "tracing",
 "tracing-subscriber",
 ]
@@ -3023,7 +3051,7 @@ dependencies = [

 [[package]]
 name = "ruff_wasm"
-version = "0.8.1"
+version = "0.8.3"
 dependencies = [
 "console_error_panic_hook",
 "console_log",
@@ -3074,7 +3102,7 @@ dependencies = [
 "ruff_python_semantic",
 "ruff_python_stdlib",
 "ruff_source_file",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "schemars",
 "serde",
 "shellexpand",
@@ -3101,9 +3129,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"

 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"

 [[package]]
 name = "rustix"
@@ -3120,9 +3148,9 @@ dependencies = [

 [[package]]
 name = "rustls"
-version = "0.23.10"
+version = "0.23.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
+checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1"
 dependencies = [
 "log",
 "once_cell",
@@ -3135,15 +3163,15 @@ dependencies = [

 [[package]]
 name = "rustls-pki-types"
-version = "1.7.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"

 [[package]]
 name = "rustls-webpki"
-version = "0.102.5"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
 "ring",
 "rustls-pki-types",
@@ -3175,7 +3203,7 @@ dependencies = [
 "indexmap",
 "lazy_static",
 "parking_lot",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
 "salsa-macro-rules",
 "salsa-macros",
 "smallvec",
@@ -3195,7 +3223,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 "synstructure",
 ]

@@ -3229,7 +3257,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "serde_derive_internals",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -3278,7 +3306,7 @@ checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -3289,7 +3317,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -3312,7 +3340,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -3353,7 +3381,7 @@ dependencies = [
 "darling",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -3386,10 +3414,16 @@ dependencies = [
 ]

 [[package]]
-name = "similar"
-version = "2.5.0"
+name = "shlex"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "similar"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e"

 [[package]]
 name = "siphasher"
@@ -3461,7 +3495,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustversion",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -3472,9 +3506,20 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"

 [[package]]
 name = "syn"
-version = "2.0.89"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3489,7 +3534,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -3552,7 +3597,7 @@ dependencies = [
 "cfg-if",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -3563,7 +3608,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 "test-case-core",
 ]

@@ -3578,11 +3623,11 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "2.0.3"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47"
 dependencies = [
- "thiserror-impl 2.0.3",
+ "thiserror-impl 2.0.6",
 ]

 [[package]]
@@ -3593,18 +3638,18 @@ checksum = "b607164372e89797d78b8e23a6d67d5d1038c1c65efd52e1389ef8b77caba2a6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "2.0.3"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
+checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -3708,9 +3753,9 @@ dependencies = [

 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
 "log",
 "pin-project-lite",
@@ -3720,20 +3765,20 @@ dependencies = [

 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
 "once_cell",
 "valuable",
@@ -3752,9 +3797,9 @@ dependencies = [

 [[package]]
 name = "tracing-indicatif"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069580424efe11d97c3fef4197fa98c004fa26672cc71ad8770d224e23b1951d"
+checksum = "74ba258e9de86447f75edf6455fded8e5242704c6fccffe7bf8d7fb6daef1180"
 dependencies = [
 "indicatif",
 "tracing",
@@ -3775,9 +3820,9 @@ dependencies = [

 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
 "matchers",
 "nu-ansi-term 0.46.0",
@@ -3926,9 +3971,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"

 [[package]]
 name = "ureq"
-version = "2.10.1"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
+checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d"
 dependencies = [
 "base64 0.22.0",
 "flate2",
@@ -3996,7 +4041,7 @@ checksum = "6b91f57fe13a38d0ce9e28a03463d8d3c2468ed03d75375110ec71d93b449a08"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -4071,9 +4116,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.95"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
+checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c"
 dependencies = [
 "cfg-if",
 "once_cell",
@@ -4082,36 +4127,37 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.95"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
+checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd"
 dependencies = [
 "bumpalo",
 "log",
 "once_cell",
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 "wasm-bindgen-shared",
 ]

 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.45"
+version = "0.4.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
+checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d"
 dependencies = [
 "cfg-if",
 "js-sys",
+ "once_cell",
 "wasm-bindgen",
 "web-sys",
 ]

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.95"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
+checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -4119,32 +4165,32 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.95"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
+checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.95"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49"

 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.45"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d381749acb0943d357dcbd8f0b100640679883fcdeeef04def49daf8d33a5426"
+checksum = "3d919bb60ebcecb9160afee6c71b43a58a4f0517a2de0054cd050d02cec08201"
 dependencies = [
- "console_error_panic_hook",
 "js-sys",
 "minicov",
+ "once_cell",
 "scoped-tls",
 "wasm-bindgen",
 "wasm-bindgen-futures",
@@ -4153,20 +4199,20 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.45"
+version = "0.3.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0"
+checksum = "222ebde6ea87fbfa6bdd2e9f1fd8a91d60aee5db68792632176c4e16a74fc7d8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
@@ -4462,7 +4508,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 "synstructure",
 ]

@@ -4483,7 +4529,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
@@ -4503,7 +4549,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 "synstructure",
 ]

@@ -4532,7 +4578,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.90",
 ]

 [[package]]
--- a/README.md
+++ b/README.md
@@ -119,6 +119,10 @@ For more, see the [documentation](https://docs.astral.sh/ruff/).
 Ruff is available as [`ruff`](https://pypi.org/project/ruff/) on PyPI:

 ```shell
+# With uv.
+uv add --dev ruff     # to add ruff to your project
+uv tool install ruff  # to install ruff globally
+
 # With pip.
 pip install ruff

@@ -136,8 +140,8 @@ curl -LsSf https://astral.sh/ruff/install.sh | sh
 powershell -c "irm https://astral.sh/ruff/install.ps1 | iex"

 # For a specific version.
-curl -LsSf https://astral.sh/ruff/0.8.1/install.sh | sh
-powershell -c "irm https://astral.sh/ruff/0.8.1/install.ps1 | iex"
+curl -LsSf https://astral.sh/ruff/0.8.3/install.sh | sh
+powershell -c "irm https://astral.sh/ruff/0.8.3/install.ps1 | iex"
 ```

 You can also install Ruff via [Homebrew](https://formulae.brew.sh/formula/ruff), [Conda](https://anaconda.org/conda-forge/ruff),
@@ -170,7 +174,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com/) hook via [`ruff
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
  # Ruff version.
-  rev: v0.8.1
+  rev: v0.8.3
  hooks:
    # Run the linter.
    - id: ruff
--- a/crates/red_knot/docs/tracing.md
+++ b/crates/red_knot/docs/tracing.md
@@ -103,7 +103,7 @@ called **once**.

 ## Profiling

-Red Knot generates a folded stack trace  to the current directory named `tracing.folded` when setting the environment variable `RED_KNOT_LOG_PROFILE` to `1` or `true`.
+Red Knot generates a folded stack trace to the current directory named `tracing.folded` when setting the environment variable `RED_KNOT_LOG_PROFILE` to `1` or `true`.

 ```bash
 RED_KNOT_LOG_PROFILE=1 red_knot -- --current-directory=../test -vvv
--- a/crates/red_knot/src/main.rs
+++ b/crates/red_knot/src/main.rs
@@ -5,6 +5,7 @@ use anyhow::{anyhow, Context};
 use clap::Parser;
 use colored::Colorize;
 use crossbeam::channel as crossbeam_channel;
+use python_version::PythonVersion;
 use red_knot_python_semantic::SitePackages;
 use red_knot_server::run_server;
 use red_knot_workspace::db::RootDatabase;
@@ -15,12 +16,11 @@ use red_knot_workspace::workspace::WorkspaceMetadata;
 use ruff_db::diagnostic::Diagnostic;
 use ruff_db::system::{OsSystem, System, SystemPath, SystemPathBuf};
 use salsa::plumbing::ZalsaDatabase;
-use target_version::TargetVersion;

 use crate::logging::{setup_tracing, Verbosity};

 mod logging;
-mod target_version;
+mod python_version;
 mod verbosity;

 #[derive(Debug, Parser)]
@@ -34,54 +34,39 @@ struct Args {
    #[command(subcommand)]
    pub(crate) command: Option<Command>,

-    #[arg(
-        long,
-        help = "Changes the current working directory.",
-        long_help = "Changes the current working directory before any specified operations. This affects the workspace and configuration discovery.",
-        value_name = "PATH"
-    )]
-    current_directory: Option<SystemPathBuf>,
+    /// Run the command within the given project directory.
+    ///
+    /// All `pyproject.toml` files will be discovered by walking up the directory tree from the given project directory,
+    /// as will the project's virtual environment (`.venv`) unless the `venv-path` option is set.
+    ///
+    /// Other command-line arguments (such as relative paths) will be resolved relative to the current working directory.
+    #[arg(long, value_name = "PROJECT")]
+    project: Option<SystemPathBuf>,

-    #[arg(
-        long,
-        help = "Path to the virtual environment the project uses",
-        long_help = "\
-Path to the virtual environment the project uses. \
-If provided, red-knot will use the `site-packages` directory of this virtual environment \
-to resolve type information for the project's third-party dependencies.",
-        value_name = "PATH"
-    )]
+    /// Path to the virtual environment the project uses.
+    ///
+    /// If provided, red-knot will use the `site-packages` directory of this virtual environment
+    /// to resolve type information for the project's third-party dependencies.
+    #[arg(long, value_name = "PATH")]
    venv_path: Option<SystemPathBuf>,

-    #[arg(
-        long,
-        value_name = "DIRECTORY",
-        help = "Custom directory to use for stdlib typeshed stubs"
-    )]
-    custom_typeshed_dir: Option<SystemPathBuf>,
+    /// Custom directory to use for stdlib typeshed stubs.
+    #[arg(long, value_name = "PATH", alias = "custom-typeshed-dir")]
+    typeshed: Option<SystemPathBuf>,

-    #[arg(
-        long,
-        value_name = "PATH",
-        help = "Additional path to use as a module-resolution source (can be passed multiple times)"
-    )]
+    /// Additional path to use as a module-resolution source (can be passed multiple times).
+    #[arg(long, value_name = "PATH")]
    extra_search_path: Option<Vec<SystemPathBuf>>,

-    #[arg(
-        long,
-        help = "Python version to assume when resolving types",
-        value_name = "VERSION"
-    )]
-    target_version: Option<TargetVersion>,
+    /// Python version to assume when resolving types.
+    #[arg(long, value_name = "VERSION", alias = "target-version")]
+    python_version: Option<PythonVersion>,

    #[clap(flatten)]
    verbosity: Verbosity,

-    #[arg(
-        long,
-        help = "Run in watch mode by re-running whenever files change",
-        short = 'W'
-    )]
+    /// Run in watch mode by re-running whenever files change.
+    #[arg(long, short = 'W')]
    watch: bool,
 }

@@ -89,8 +74,8 @@ impl Args {
    fn to_configuration(&self, cli_cwd: &SystemPath) -> Configuration {
        let mut configuration = Configuration::default();

-        if let Some(target_version) = self.target_version {
-            configuration.target_version = Some(target_version.into());
+        if let Some(python_version) = self.python_version {
+            configuration.python_version = Some(python_version.into());
        }

        if let Some(venv_path) = &self.venv_path {
@@ -99,9 +84,8 @@ impl Args {
            });
        }

-        if let Some(custom_typeshed_dir) = &self.custom_typeshed_dir {
-            configuration.search_paths.custom_typeshed =
-                Some(SystemPath::absolute(custom_typeshed_dir, cli_cwd));
+        if let Some(typeshed) = &self.typeshed {
+            configuration.search_paths.typeshed = Some(SystemPath::absolute(typeshed, cli_cwd));
        }

        if let Some(extra_search_paths) = &self.extra_search_path {
@@ -167,15 +151,13 @@ fn run() -> anyhow::Result<ExitStatus> {
    };

    let cwd = args
-        .current_directory
+        .project
        .as_ref()
        .map(|cwd| {
            if cwd.as_std_path().is_dir() {
                Ok(SystemPath::absolute(cwd, &cli_base_path))
            } else {
-                Err(anyhow!(
-                    "Provided current-directory path `{cwd}` is not a directory"
-                ))
+                Err(anyhow!("Provided project path `{cwd}` is not a directory"))
            }
        })
        .transpose()?
--- a/crates/red_knot/src/python_version.rs
+++ b/crates/red_knot/src/python_version.rs
@@ -0,0 +1,68 @@
+/// Enumeration of all supported Python versions
+///
+/// TODO: unify with the `PythonVersion` enum in the linter/formatter crates?
+#[derive(Copy, Clone, Hash, Debug, PartialEq, Eq, PartialOrd, Ord, Default, clap::ValueEnum)]
+pub enum PythonVersion {
+    #[value(name = "3.7")]
+    Py37,
+    #[value(name = "3.8")]
+    Py38,
+    #[default]
+    #[value(name = "3.9")]
+    Py39,
+    #[value(name = "3.10")]
+    Py310,
+    #[value(name = "3.11")]
+    Py311,
+    #[value(name = "3.12")]
+    Py312,
+    #[value(name = "3.13")]
+    Py313,
+}
+
+impl PythonVersion {
+    const fn as_str(self) -> &'static str {
+        match self {
+            Self::Py37 => "3.7",
+            Self::Py38 => "3.8",
+            Self::Py39 => "3.9",
+            Self::Py310 => "3.10",
+            Self::Py311 => "3.11",
+            Self::Py312 => "3.12",
+            Self::Py313 => "3.13",
+        }
+    }
+}
+
+impl std::fmt::Display for PythonVersion {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(self.as_str())
+    }
+}
+
+impl From<PythonVersion> for red_knot_python_semantic::PythonVersion {
+    fn from(value: PythonVersion) -> Self {
+        match value {
+            PythonVersion::Py37 => Self::PY37,
+            PythonVersion::Py38 => Self::PY38,
+            PythonVersion::Py39 => Self::PY39,
+            PythonVersion::Py310 => Self::PY310,
+            PythonVersion::Py311 => Self::PY311,
+            PythonVersion::Py312 => Self::PY312,
+            PythonVersion::Py313 => Self::PY313,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::python_version::PythonVersion;
+
+    #[test]
+    fn same_default_as_python_version() {
+        assert_eq!(
+            red_knot_python_semantic::PythonVersion::from(PythonVersion::default()),
+            red_knot_python_semantic::PythonVersion::default()
+        );
+    }
+}
--- a/crates/red_knot/src/target_version.rs
+++ b/crates/red_knot/src/target_version.rs
@@ -1,62 +0,0 @@
-/// Enumeration of all supported Python versions
-///
-/// TODO: unify with the `PythonVersion` enum in the linter/formatter crates?
-#[derive(Copy, Clone, Hash, Debug, PartialEq, Eq, PartialOrd, Ord, Default, clap::ValueEnum)]
-pub enum TargetVersion {
-    Py37,
-    Py38,
-    #[default]
-    Py39,
-    Py310,
-    Py311,
-    Py312,
-    Py313,
-}
-
-impl TargetVersion {
-    const fn as_str(self) -> &'static str {
-        match self {
-            Self::Py37 => "py37",
-            Self::Py38 => "py38",
-            Self::Py39 => "py39",
-            Self::Py310 => "py310",
-            Self::Py311 => "py311",
-            Self::Py312 => "py312",
-            Self::Py313 => "py313",
-        }
-    }
-}
-
-impl std::fmt::Display for TargetVersion {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.write_str(self.as_str())
-    }
-}
-
-impl From<TargetVersion> for red_knot_python_semantic::PythonVersion {
-    fn from(value: TargetVersion) -> Self {
-        match value {
-            TargetVersion::Py37 => Self::PY37,
-            TargetVersion::Py38 => Self::PY38,
-            TargetVersion::Py39 => Self::PY39,
-            TargetVersion::Py310 => Self::PY310,
-            TargetVersion::Py311 => Self::PY311,
-            TargetVersion::Py312 => Self::PY312,
-            TargetVersion::Py313 => Self::PY313,
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::target_version::TargetVersion;
-    use red_knot_python_semantic::PythonVersion;
-
-    #[test]
-    fn same_default_as_python_version() {
-        assert_eq!(
-            PythonVersion::from(TargetVersion::default()),
-            PythonVersion::default()
-        );
-    }
-}
--- a/crates/red_knot/tests/file_watching.rs
+++ b/crates/red_knot/tests/file_watching.rs
@@ -1,25 +1,23 @@
 #![allow(clippy::disallowed_names)]

 use std::io::Write;
-use std::time::Duration;
+use std::time::{Duration, Instant};

 use anyhow::{anyhow, Context};
 use red_knot_python_semantic::{resolve_module, ModuleName, Program, PythonVersion, SitePackages};
 use red_knot_workspace::db::{Db, RootDatabase};
-use red_knot_workspace::watch;
-use red_knot_workspace::watch::{directory_watcher, WorkspaceWatcher};
+use red_knot_workspace::watch::{directory_watcher, ChangeEvent, WorkspaceWatcher};
 use red_knot_workspace::workspace::settings::{Configuration, SearchPathConfiguration};
 use red_knot_workspace::workspace::WorkspaceMetadata;
 use ruff_db::files::{system_path_to_file, File, FileError};
 use ruff_db::source::source_text;
 use ruff_db::system::{OsSystem, SystemPath, SystemPathBuf};
-use ruff_db::testing::{setup_logging, setup_logging_with_filter};
 use ruff_db::Upcast;

 struct TestCase {
    db: RootDatabase,
    watcher: Option<WorkspaceWatcher>,
-    changes_receiver: crossbeam::channel::Receiver<Vec<watch::ChangeEvent>>,
+    changes_receiver: crossbeam::channel::Receiver<Vec<ChangeEvent>>,
    /// The temporary directory that contains the test files.
    /// We need to hold on to it in the test case or the temp files get deleted.
    _temp_dir: tempfile::TempDir,
@@ -40,12 +38,36 @@ impl TestCase {
        &self.db
    }

-    fn stop_watch(&mut self) -> Vec<watch::ChangeEvent> {
-        self.try_stop_watch(Duration::from_secs(10))
-            .expect("Expected watch changes but observed none")
+    #[track_caller]
+    fn stop_watch<M>(&mut self, matcher: M) -> Vec<ChangeEvent>
+    where
+        M: MatchEvent,
+    {
+        // track_caller is unstable for lambdas -> That's why this is a fn
+        #[track_caller]
+        fn panic_with_formatted_events(events: Vec<ChangeEvent>) -> Vec<ChangeEvent> {
+            panic!(
+                "Didn't observe expected change:\n{}",
+                events
+                    .into_iter()
+                    .map(|event| format!("  - {event:?}"))
+                    .collect::<Vec<_>>()
+                    .join("\n")
+            )
+        }
+
+        self.try_stop_watch(matcher, Duration::from_secs(10))
+            .unwrap_or_else(panic_with_formatted_events)
    }

-    fn try_stop_watch(&mut self, timeout: Duration) -> Option<Vec<watch::ChangeEvent>> {
+    fn try_stop_watch<M>(
+        &mut self,
+        mut matcher: M,
+        timeout: Duration,
+    ) -> Result<Vec<ChangeEvent>, Vec<ChangeEvent>>
+    where
+        M: MatchEvent,
+    {
        tracing::debug!("Try stopping watch with timeout {:?}", timeout);

        let watcher = self
@@ -53,36 +75,50 @@ impl TestCase {
            .take()
            .expect("Cannot call `stop_watch` more than once");

-        let mut all_events = self
-            .changes_receiver
-            .recv_timeout(timeout)
-            .unwrap_or_default();
+        let start = Instant::now();
+        let mut all_events = Vec::new();
+
+        loop {
+            let events = self
+                .changes_receiver
+                .recv_timeout(Duration::from_millis(100))
+                .unwrap_or_default();
+
+            if events
+                .iter()
+                .any(|event| matcher.match_event(event) || event.is_rescan())
+            {
+                all_events.extend(events);
+                break;
+            }
+
+            all_events.extend(events);
+
+            if start.elapsed() > timeout {
+                return Err(all_events);
+            }
+        }

        watcher.flush();
        tracing::debug!("Flushed file watcher");
        watcher.stop();
        tracing::debug!("Stopping file watcher");

+        // Consume remaining events
        for event in &self.changes_receiver {
            all_events.extend(event);
        }

-        if all_events.is_empty() {
-            return None;
-        }
-
-        Some(all_events)
+        Ok(all_events)
    }

-    fn take_watch_changes(&self) -> Vec<watch::ChangeEvent> {
+    fn take_watch_changes(&self) -> Vec<ChangeEvent> {
        self.try_take_watch_changes(Duration::from_secs(10))
            .expect("Expected watch changes but observed none")
    }

-    fn try_take_watch_changes(&self, timeout: Duration) -> Option<Vec<watch::ChangeEvent>> {
-        let Some(watcher) = &self.watcher else {
-            return None;
-        };
+    fn try_take_watch_changes(&self, timeout: Duration) -> Option<Vec<ChangeEvent>> {
+        let watcher = self.watcher.as_ref()?;

        let mut all_events = self
            .changes_receiver
@@ -104,7 +140,7 @@ impl TestCase {
        Some(all_events)
    }

-    fn apply_changes(&mut self, changes: Vec<watch::ChangeEvent>) {
+    fn apply_changes(&mut self, changes: Vec<ChangeEvent>) {
        self.db.apply_changes(changes, Some(&self.configuration));
    }

@@ -140,6 +176,23 @@ impl TestCase {
    }
 }

+trait MatchEvent {
+    fn match_event(&mut self, event: &ChangeEvent) -> bool;
+}
+
+fn event_for_file(name: &str) -> impl MatchEvent + '_ {
+    |event: &ChangeEvent| event.file_name() == Some(name)
+}
+
+impl<F> MatchEvent for F
+where
+    F: FnMut(&ChangeEvent) -> bool,
+{
+    fn match_event(&mut self, event: &ChangeEvent) -> bool {
+        (*self)(event)
+    }
+}
+
 trait SetupFiles {
    fn setup(self, root_path: &SystemPath, workspace_path: &SystemPath) -> anyhow::Result<()>;
 }
@@ -229,7 +282,7 @@ where
        .extra_paths
        .iter()
        .flatten()
-        .chain(search_paths.custom_typeshed.iter())
+        .chain(search_paths.typeshed.iter())
        .chain(search_paths.site_packages.iter().flat_map(|site_packages| {
            if let SitePackages::Known(path) = site_packages {
                path.as_slice()
@@ -243,7 +296,7 @@ where
    }

    let configuration = Configuration {
-        target_version: Some(PythonVersion::PY312),
+        python_version: Some(PythonVersion::PY312),
        search_paths,
    };

@@ -315,7 +368,7 @@ fn new_file() -> anyhow::Result<()> {

    std::fs::write(foo_path.as_std_path(), "print('Hello')")?;

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

    case.apply_changes(changes);

@@ -338,7 +391,7 @@ fn new_ignored_file() -> anyhow::Result<()> {

    std::fs::write(foo_path.as_std_path(), "print('Hello')")?;

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

    case.apply_changes(changes);

@@ -360,7 +413,7 @@ fn changed_file() -> anyhow::Result<()> {

    update_file(&foo_path, "print('Version 2')")?;

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

    assert!(!changes.is_empty());

@@ -385,7 +438,7 @@ fn deleted_file() -> anyhow::Result<()> {

    std::fs::remove_file(foo_path.as_std_path())?;

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

    case.apply_changes(changes);

@@ -417,7 +470,7 @@ fn move_file_to_trash() -> anyhow::Result<()> {
        trash_path.join("foo.py").as_std_path(),
    )?;

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

    case.apply_changes(changes);

@@ -449,7 +502,7 @@ fn move_file_to_workspace() -> anyhow::Result<()> {

    std::fs::rename(foo_path.as_std_path(), foo_in_workspace_path.as_std_path())?;

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

    case.apply_changes(changes);

@@ -477,7 +530,7 @@ fn rename_file() -> anyhow::Result<()> {

    std::fs::rename(foo_path.as_std_path(), bar_path.as_std_path())?;

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

    case.apply_changes(changes);

@@ -521,7 +574,7 @@ fn directory_moved_to_workspace() -> anyhow::Result<()> {
    std::fs::rename(sub_original_path.as_std_path(), sub_new_path.as_std_path())
        .with_context(|| "Failed to move sub directory")?;

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

    case.apply_changes(changes);

@@ -580,7 +633,7 @@ fn directory_moved_to_trash() -> anyhow::Result<()> {
    std::fs::rename(sub_path.as_std_path(), trashed_sub.as_std_path())
        .with_context(|| "Failed to move the sub directory to the trash")?;

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

    case.apply_changes(changes);

@@ -604,8 +657,6 @@ fn directory_moved_to_trash() -> anyhow::Result<()> {

 #[test]
 fn directory_renamed() -> anyhow::Result<()> {
-    let _tracing = setup_logging_with_filter("file_watching=TRACE,red_knot=TRACE");
-
    let mut case = setup([
        ("bar.py", "import sub.a"),
        ("sub/__init__.py", ""),
@@ -644,11 +695,8 @@ fn directory_renamed() -> anyhow::Result<()> {
    std::fs::rename(sub_path.as_std_path(), foo_baz.as_std_path())
        .with_context(|| "Failed to move the sub directory")?;

-    let changes = case.stop_watch();
-
-    for event in &changes {
-        tracing::debug!("Event: {:?}", event);
-    }
+    // Linux and windows only emit an event for the newly created root directory, but not for every new component.
+    let changes = case.stop_watch(event_for_file("sub"));

    case.apply_changes(changes);

@@ -721,7 +769,7 @@ fn directory_deleted() -> anyhow::Result<()> {
    std::fs::remove_dir_all(sub_path.as_std_path())
        .with_context(|| "Failed to remove the sub directory")?;

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

    case.apply_changes(changes);

@@ -758,7 +806,7 @@ fn search_path() -> anyhow::Result<()> {

    std::fs::write(site_packages.join("a.py").as_std_path(), "class A: ...")?;

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

    case.apply_changes(changes);

@@ -789,7 +837,7 @@ fn add_search_path() -> anyhow::Result<()> {

    std::fs::write(site_packages.join("a.py").as_std_path(), "class A: ...")?;

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

    case.apply_changes(changes);

@@ -818,9 +866,9 @@ fn remove_search_path() -> anyhow::Result<()> {

    std::fs::write(site_packages.join("a.py").as_std_path(), "class A: ...")?;

-    let changes = case.try_stop_watch(Duration::from_millis(100));
+    let changes = case.try_stop_watch(|_: &ChangeEvent| true, Duration::from_millis(100));

-    assert_eq!(changes, None);
+    assert_eq!(changes, Err(vec![]));

    Ok(())
 }
@@ -840,7 +888,7 @@ fn changed_versions_file() -> anyhow::Result<()> {
            Ok(())
        },
        |root_path, _workspace_path| SearchPathConfiguration {
-            custom_typeshed: Some(root_path.join("typeshed")),
+            typeshed: Some(root_path.join("typeshed")),
            ..SearchPathConfiguration::default()
        },
    )?;
@@ -858,7 +906,7 @@ fn changed_versions_file() -> anyhow::Result<()> {
        "os: 3.0-",
    )?;

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

    case.apply_changes(changes);

@@ -911,7 +959,7 @@ fn hard_links_in_workspace() -> anyhow::Result<()> {
    // Write to the hard link target.
    update_file(foo_path, "print('Version 2')").context("Failed to update foo.py")?;

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

    case.apply_changes(changes);

@@ -982,7 +1030,7 @@ fn hard_links_to_target_outside_workspace() -> anyhow::Result<()> {
    // Write to the hard link target.
    update_file(foo_path, "print('Version 2')").context("Failed to update foo.py")?;

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

    case.apply_changes(changes);

@@ -1021,7 +1069,7 @@ mod unix {
        )
        .with_context(|| "Failed to set file permissions.")?;

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

        case.apply_changes(changes);

@@ -1119,7 +1167,7 @@ mod unix {
        update_file(baz_workspace, "def baz(): print('Version 3')")
            .context("Failed to update bar/baz.py")?;

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

        case.apply_changes(changes);

@@ -1190,7 +1238,7 @@ mod unix {
        update_file(&patched_bar_baz, "def baz(): print('Version 2')")
            .context("Failed to update bar/baz.py")?;

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

        case.apply_changes(changes);

@@ -1298,7 +1346,7 @@ mod unix {
        update_file(&baz_original, "def baz(): print('Version 2')")
            .context("Failed to update bar/baz.py")?;

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

        case.apply_changes(changes);

@@ -1352,7 +1400,7 @@ fn nested_packages_delete_root() -> anyhow::Result<()> {

    std::fs::remove_file(case.workspace_path("pyproject.toml").as_std_path())?;

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

    case.apply_changes(changes);

@@ -1364,7 +1412,6 @@ fn nested_packages_delete_root() -> anyhow::Result<()> {

 #[test]
 fn added_package() -> anyhow::Result<()> {
-    let _ = setup_logging();
    let mut case = setup([
        (
            "pyproject.toml",
@@ -1406,7 +1453,7 @@ fn added_package() -> anyhow::Result<()> {
    )
    .context("failed to write pyproject.toml for package b")?;

-    let changes = case.stop_watch();
+    let changes = case.stop_watch(event_for_file("pyproject.toml"));

    case.apply_changes(changes);

@@ -1449,7 +1496,7 @@ fn removed_package() -> anyhow::Result<()> {
    std::fs::remove_dir_all(case.workspace_path("packages/b").as_std_path())
        .context("failed to remove package 'b'")?;

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

    case.apply_changes(changes);

--- a/crates/red_knot_python_semantic/Cargo.toml
+++ b/crates/red_knot_python_semantic/Cargo.toml
@@ -13,6 +13,7 @@ license = { workspace = true }
 [dependencies]
 ruff_db = { workspace = true }
 ruff_index = { workspace = true }
+ruff_macros = { workspace = true }
 ruff_python_ast = { workspace = true }
 ruff_python_parser = { workspace = true }
 ruff_python_stdlib = { workspace = true }
@@ -49,6 +50,12 @@ anyhow = { workspace = true }
 dir-test = { workspace = true }
 insta = { workspace = true }
 tempfile = { workspace = true }
+quickcheck = { version = "1.0.3", default-features = false }
+quickcheck_macros = { version = "1.0.0" }
+
+[features]
+serde = ["ruff_db/serde", "dep:serde"]

 [lints]
 workspace = true
+
--- a/crates/red_knot_python_semantic/resources/mdtest/annotations/any.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/annotations/any.md
@@ -0,0 +1,83 @@
+# Any
+
+## Annotation
+
+`typing.Any` is a way to name the Any type.
+
+```py
+from typing import Any
+
+x: Any = 1
+x = "foo"
+
+def f():
+    reveal_type(x)  # revealed: Any
+```
+
+## Aliased to a different name
+
+If you alias `typing.Any` to another name, we still recognize that as a spelling of the Any type.
+
+```py
+from typing import Any as RenamedAny
+
+x: RenamedAny = 1
+x = "foo"
+
+def f():
+    reveal_type(x)  # revealed: Any
+```
+
+## Shadowed class
+
+If you define your own class named `Any`, using that in a type expression refers to your class, and
+isn't a spelling of the Any type.
+
+```py
+class Any: ...
+
+x: Any
+
+def f():
+    reveal_type(x)  # revealed: Any
+
+# This verifies that we're not accidentally seeing typing.Any, since str is assignable
+# to that but not to our locally defined class.
+y: Any = "not an Any"  # error: [invalid-assignment]
+```
+
+## Subclass
+
+The spec allows you to define subclasses of `Any`.
+
+TODO: Handle assignments correctly. `Subclass` has an unknown superclass, which might be `int`. The
+assignment to `x` should not be allowed, even when the unknown superclass is `int`. The assignment
+to `y` should be allowed, since `Subclass` might have `int` as a superclass, and is therefore
+assignable to `int`.
+
+```py
+from typing import Any
+
+class Subclass(Any): ...
+
+reveal_type(Subclass.__mro__)  # revealed: tuple[Literal[Subclass], Any, Literal[object]]
+
+x: Subclass = 1  # error: [invalid-assignment]
+# TODO: no diagnostic
+y: int = Subclass()  # error: [invalid-assignment]
+
+def _(s: Subclass):
+    reveal_type(s)  # revealed: Subclass
+```
+
+## Invalid
+
+`Any` cannot be parameterized:
+
+```py
+from typing import Any
+
+# error: [invalid-type-parameter] "Type `typing.Any` expected no type parameter"
+def f(x: Any[int]):
+    reveal_type(x)  # revealed: Unknown
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/annotations/literal_string.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/annotations/literal_string.md
@@ -0,0 +1,150 @@
+# `LiteralString`
+
+`LiteralString` represents a string that is either defined directly within the source code or is
+made up of such components.
+
+Parts of the testcases defined here were adapted from [the specification's examples][1].
+
+## Usages
+
+### Valid places
+
+It can be used anywhere a type is accepted:
+
+```py
+from typing_extensions import LiteralString
+
+x: LiteralString
+
+def f():
+    reveal_type(x)  # revealed: LiteralString
+```
+
+### Within `Literal`
+
+`LiteralString` cannot be used within `Literal`:
+
+```py
+from typing_extensions import Literal, LiteralString
+
+bad_union: Literal["hello", LiteralString]  # error: [invalid-literal-parameter]
+bad_nesting: Literal[LiteralString]  # error: [invalid-literal-parameter]
+```
+
+### Parametrized
+
+`LiteralString` cannot be parametrized.
+
+```py
+from typing_extensions import LiteralString
+
+a: LiteralString[str]  # error: [invalid-type-parameter]
+b: LiteralString["foo"]  # error: [invalid-type-parameter]
+```
+
+### As a base class
+
+Subclassing `LiteralString` leads to a runtime error.
+
+```py
+from typing_extensions import LiteralString
+
+class C(LiteralString): ...  # error: [invalid-base]
+```
+
+## Inference
+
+### Common operations
+
+```py
+from typing_extensions import LiteralString
+
+foo: LiteralString = "foo"
+reveal_type(foo)  # revealed: Literal["foo"]
+
+bar: LiteralString = "bar"
+reveal_type(foo + bar)  # revealed: Literal["foobar"]
+
+baz: LiteralString = "baz"
+baz += foo
+reveal_type(baz)  # revealed: Literal["bazfoo"]
+
+qux = (foo, bar)
+reveal_type(qux)  # revealed: tuple[Literal["foo"], Literal["bar"]]
+
+# TODO: Infer "LiteralString"
+reveal_type(foo.join(qux))  # revealed: @Todo(call todo)
+
+template: LiteralString = "{}, {}"
+reveal_type(template)  # revealed: Literal["{}, {}"]
+# TODO: Infer `LiteralString`
+reveal_type(template.format(foo, bar))  # revealed: @Todo(call todo)
+```
+
+### Assignability
+
+`Literal[""]` is assignable to `LiteralString`, and `LiteralString` is assignable to `str`, but not
+vice versa.
+
+```py
+from typing_extensions import Literal, LiteralString
+
+def _(flag: bool):
+    foo_1: Literal["foo"] = "foo"
+    bar_1: LiteralString = foo_1  # fine
+
+    foo_2 = "foo" if flag else "bar"
+    reveal_type(foo_2)  # revealed: Literal["foo", "bar"]
+    bar_2: LiteralString = foo_2  # fine
+
+    foo_3: LiteralString = "foo" * 1_000_000_000
+    bar_3: str = foo_2  # fine
+
+    baz_1: str = str()
+    qux_1: LiteralString = baz_1  # error: [invalid-assignment]
+
+    baz_2: LiteralString = "baz" * 1_000_000_000
+    qux_2: Literal["qux"] = baz_2  # error: [invalid-assignment]
+
+    baz_3 = "foo" if flag else 1
+    reveal_type(baz_3)  # revealed: Literal["foo"] | Literal[1]
+    qux_3: LiteralString = baz_3  # error: [invalid-assignment]
+```
+
+### Narrowing
+
+```py
+from typing_extensions import LiteralString
+
+lorem: LiteralString = "lorem" * 1_000_000_000
+
+reveal_type(lorem)  # revealed: LiteralString
+
+if lorem == "ipsum":
+    reveal_type(lorem)  # revealed: Literal["ipsum"]
+
+reveal_type(lorem)  # revealed: LiteralString
+
+if "" < lorem == "ipsum":
+    reveal_type(lorem)  # revealed: Literal["ipsum"]
+```
+
+## `typing.LiteralString`
+
+`typing.LiteralString` is only available in Python 3.11 and later:
+
+```toml
+[environment]
+python-version = "3.11"
+```
+
+```py
+from typing import LiteralString
+
+x: LiteralString = "foo"
+
+def f():
+    reveal_type(x)  # revealed: LiteralString
+```
+
+[1]: https://typing.readthedocs.io/en/latest/spec/literal.html#literalstring
--- a/crates/red_knot_python_semantic/resources/mdtest/annotations/never.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/annotations/never.md
@@ -19,12 +19,11 @@ reveal_type(stop())
 ## Assignment

 ```py
-from typing import NoReturn, Never, Any
+from typing_extensions import NoReturn, Never, Any

 # error: [invalid-type-parameter] "Type `typing.Never` expected no type parameter"
 x: Never[int]
 a1: NoReturn
-# TODO: Test `Never` is only available in python >= 3.11
 a2: Never
 b1: Any
 b2: int
@@ -46,17 +45,20 @@ def f():
    v6: Never = 1
 ```

-## Typing Extensions
+## `typing.Never`
+
+`typing.Never` is only available in Python 3.11 and later:
+
+```toml
+[environment]
+python-version = "3.11"
+```

 ```py
-from typing_extensions import NoReturn, Never
+from typing import Never

-x: NoReturn
-y: Never
+x: Never

 def f():
-    # revealed: Never
-    reveal_type(x)
-    # revealed: Never
-    reveal_type(y)
+    reveal_type(x)  # revealed: Never
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/annotations/starred.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/annotations/starred.md
@@ -8,8 +8,8 @@ from typing_extensions import TypeVarTuple
 Ts = TypeVarTuple("Ts")

 def append_int(*args: *Ts) -> tuple[*Ts, int]:
-    # TODO: should show some representation of the variadic generic type
-    reveal_type(args)  # revealed: @Todo(function parameter type)
+    # TODO: tuple[*Ts]
+    reveal_type(args)  # revealed: tuple

    return (*args, 1)

--- a/crates/red_knot_python_semantic/resources/mdtest/annotations/stdlib_typing_aliases.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/annotations/stdlib_typing_aliases.md
@@ -0,0 +1,83 @@
+# Typing-module aliases to other stdlib classes
+
+The `typing` module has various aliases to other stdlib classes. These are a legacy feature, but
+still need to be supported by a type checker.
+
+## Currently unsupported
+
+Support for most of these symbols is currently a TODO:
+
+```py
+import typing
+
+def f(
+    a: typing.List,
+    b: typing.List[int],
+    c: typing.Dict,
+    d: typing.Dict[int, str],
+    e: typing.DefaultDict,
+    f: typing.DefaultDict[str, int],
+    g: typing.Set,
+    h: typing.Set[int],
+    i: typing.FrozenSet,
+    j: typing.FrozenSet[str],
+    k: typing.OrderedDict,
+    l: typing.OrderedDict[int, str],
+    m: typing.Counter,
+    n: typing.Counter[int],
+):
+    reveal_type(a)  # revealed: @Todo(Unsupported or invalid type in a type expression)
+    reveal_type(b)  # revealed: @Todo(typing.List alias)
+    reveal_type(c)  # revealed: @Todo(Unsupported or invalid type in a type expression)
+    reveal_type(d)  # revealed: @Todo(typing.Dict alias)
+    reveal_type(e)  # revealed: @Todo(Unsupported or invalid type in a type expression)
+    reveal_type(f)  # revealed: @Todo(typing.DefaultDict[] alias)
+    reveal_type(g)  # revealed: @Todo(Unsupported or invalid type in a type expression)
+    reveal_type(h)  # revealed: @Todo(typing.Set alias)
+    reveal_type(i)  # revealed: @Todo(Unsupported or invalid type in a type expression)
+    reveal_type(j)  # revealed: @Todo(typing.FrozenSet alias)
+    reveal_type(k)  # revealed: @Todo(Unsupported or invalid type in a type expression)
+    reveal_type(l)  # revealed: @Todo(typing.OrderedDict alias)
+    reveal_type(m)  # revealed: @Todo(Unsupported or invalid type in a type expression)
+    reveal_type(n)  # revealed: @Todo(typing.Counter[] alias)
+```
+
+## Inheritance
+
+The aliases can be inherited from. Some of these are still partially or wholly TODOs.
+
+```py
+import typing
+
+class A(typing.Dict): ...
+
+# TODO: should have `Generic`, should not have `Unknown`
+reveal_type(A.__mro__)  # revealed: tuple[Literal[A], Literal[dict], Unknown, Literal[object]]
+
+class B(typing.List): ...
+
+# TODO: should have `Generic`, should not have `Unknown`
+reveal_type(B.__mro__)  # revealed: tuple[Literal[B], Literal[list], Unknown, Literal[object]]
+
+class C(typing.Set): ...
+
+# TODO: should have `Generic`, should not have `Unknown`
+reveal_type(C.__mro__)  # revealed: tuple[Literal[C], Literal[set], Unknown, Literal[object]]
+
+class D(typing.FrozenSet): ...
+
+# TODO: should have `Generic`, should not have `Unknown`
+reveal_type(D.__mro__)  # revealed: tuple[Literal[D], Literal[frozenset], Unknown, Literal[object]]
+
+class E(typing.DefaultDict): ...
+
+reveal_type(E.__mro__)  # revealed: tuple[Literal[E], @Todo(Support for more typing aliases as base classes), Literal[object]]
+
+class F(typing.OrderedDict): ...
+
+reveal_type(F.__mro__)  # revealed: tuple[Literal[F], @Todo(Support for more typing aliases as base classes), Literal[object]]
+
+class G(typing.Counter): ...
+
+reveal_type(G.__mro__)  # revealed: tuple[Literal[G], @Todo(Support for more typing aliases as base classes), Literal[object]]
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/annotations/string.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/annotations/string.md
@@ -3,75 +3,56 @@
 ## Simple

 ```py
-def f() -> "int":
-    return 1
-
-reveal_type(f())  # revealed: int
+def f(v: "int"):
+    reveal_type(v)  # revealed: int
 ```

 ## Nested

 ```py
-def f() -> "'int'":
-    return 1
-
-reveal_type(f())  # revealed: int
+def f(v: "'int'"):
+    reveal_type(v)  # revealed: int
 ```

 ## Type expression

 ```py
-def f1() -> "int | str":
-    return 1
-
-def f2() -> "tuple[int, str]":
-    return 1
-
-reveal_type(f1())  # revealed: int | str
-reveal_type(f2())  # revealed: tuple[int, str]
+def f1(v: "int | str", w: "tuple[int, str]"):
+    reveal_type(v)  # revealed: int | str
+    reveal_type(w)  # revealed: tuple[int, str]
 ```

 ## Partial

 ```py
-def f() -> tuple[int, "str"]:
-    return 1
-
-reveal_type(f())  # revealed: tuple[int, str]
+def f(v: tuple[int, "str"]):
+    reveal_type(v)  # revealed: tuple[int, str]
 ```

 ## Deferred

 ```py
-def f() -> "Foo":
-    return Foo()
+def f(v: "Foo"):
+    reveal_type(v)  # revealed: Foo

-class Foo:
-    pass
-
-reveal_type(f())  # revealed: Foo
+class Foo: ...
 ```

 ## Deferred (undefined)

 ```py
 # error: [unresolved-reference]
-def f() -> "Foo":
-    pass
-
-reveal_type(f())  # revealed: Unknown
+def f(v: "Foo"):
+    reveal_type(v)  # revealed: Unknown
 ```

 ## Partial deferred

 ```py
-def f() -> int | "Foo":
-    return 1
+def f(v: int | "Foo"):
+    reveal_type(v)  # revealed: int | Foo

-class Foo:
-    pass
-
-reveal_type(f())  # revealed: int | Foo
+class Foo: ...
 ```

 ## `typing.Literal`
@@ -79,65 +60,43 @@ reveal_type(f())  # revealed: int | Foo
 ```py
 from typing import Literal

-def f1() -> Literal["Foo", "Bar"]:
-    return "Foo"
+def f1(v: Literal["Foo", "Bar"], w: 'Literal["Foo", "Bar"]'):
+    reveal_type(v)  # revealed: Literal["Foo", "Bar"]
+    reveal_type(w)  # revealed: Literal["Foo", "Bar"]

-def f2() -> 'Literal["Foo", "Bar"]':
-    return "Foo"
-
-class Foo:
-    pass
-
-reveal_type(f1())  # revealed: Literal["Foo", "Bar"]
-reveal_type(f2())  # revealed: Literal["Foo", "Bar"]
+class Foo: ...
 ```

 ## Various string kinds

 ```py
-# error: [annotation-raw-string] "Type expressions cannot use raw string literal"
-def f1() -> r"int":
-    return 1
-
-# error: [annotation-f-string] "Type expressions cannot use f-strings"
-def f2() -> f"int":
-    return 1
-
-# error: [annotation-byte-string] "Type expressions cannot use bytes literal"
-def f3() -> b"int":
-    return 1
-
-def f4() -> "int":
-    return 1
-
-# error: [annotation-implicit-concat] "Type expressions cannot span multiple string literals"
-def f5() -> "in" "t":
-    return 1
-
-# error: [annotation-escape-character] "Type expressions cannot contain escape characters"
-def f6() -> "\N{LATIN SMALL LETTER I}nt":
-    return 1
-
-# error: [annotation-escape-character] "Type expressions cannot contain escape characters"
-def f7() -> "\x69nt":
-    return 1
-
-def f8() -> """int""":
-    return 1
-
-# error: [annotation-byte-string] "Type expressions cannot use bytes literal"
-def f9() -> "b'int'":
-    return 1
-
-reveal_type(f1())  # revealed: Unknown
-reveal_type(f2())  # revealed: Unknown
-reveal_type(f3())  # revealed: Unknown
-reveal_type(f4())  # revealed: int
-reveal_type(f5())  # revealed: Unknown
-reveal_type(f6())  # revealed: Unknown
-reveal_type(f7())  # revealed: Unknown
-reveal_type(f8())  # revealed: int
-reveal_type(f9())  # revealed: Unknown
+def f1(
+    # error: [raw-string-type-annotation] "Type expressions cannot use raw string literal"
+    a: r"int",
+    # error: [fstring-type-annotation] "Type expressions cannot use f-strings"
+    b: f"int",
+    # error: [byte-string-type-annotation] "Type expressions cannot use bytes literal"
+    c: b"int",
+    d: "int",
+    # error: [implicit-concatenated-string-type-annotation] "Type expressions cannot span multiple string literals"
+    e: "in" "t",
+    # error: [escape-character-in-forward-annotation] "Type expressions cannot contain escape characters"
+    f: "\N{LATIN SMALL LETTER I}nt",
+    # error: [escape-character-in-forward-annotation] "Type expressions cannot contain escape characters"
+    g: "\x69nt",
+    h: """int""",
+    # error: [byte-string-type-annotation] "Type expressions cannot use bytes literal"
+    i: "b'int'",
+):
+    reveal_type(a)  # revealed: Unknown
+    reveal_type(b)  # revealed: Unknown
+    reveal_type(c)  # revealed: Unknown
+    reveal_type(d)  # revealed: int
+    reveal_type(e)  # revealed: Unknown
+    reveal_type(f)  # revealed: Unknown
+    reveal_type(g)  # revealed: Unknown
+    reveal_type(h)  # revealed: int
+    reveal_type(i)  # revealed: Unknown
 ```

 ## Various string kinds in `typing.Literal`
@@ -145,10 +104,8 @@ reveal_type(f9())  # revealed: Unknown
 ```py
 from typing import Literal

-def f() -> Literal["a", r"b", b"c", "d" "e", "\N{LATIN SMALL LETTER F}", "\x67", """h"""]:
-    return "normal"
-
-reveal_type(f())  # revealed: Literal["a", "b", "de", "f", "g", "h"] | Literal[b"c"]
+def f(v: Literal["a", r"b", b"c", "d" "e", "\N{LATIN SMALL LETTER F}", "\x67", """h"""]):
+    reveal_type(v)  # revealed: Literal["a", "b", "de", "f", "g", "h"] | Literal[b"c"]
 ```

 ## Class variables
@@ -175,8 +132,7 @@ c: "Foo"
 # error: [invalid-assignment] "Object of type `Literal[1]` is not assignable to `Foo`"
 d: "Foo" = 1

-class Foo:
-    pass
+class Foo: ...

 c = Foo()

@@ -208,9 +164,9 @@ i: "{i for i in range(5)}"
 j: "{i: i for i in range(5)}"
 k: "(i for i in range(5))"
 l: "await 1"
-# error: [forward-annotation-syntax-error]
+# error: [invalid-syntax-in-forward-annotation]
 m: "yield 1"
-# error: [forward-annotation-syntax-error]
+# error: [invalid-syntax-in-forward-annotation]
 n: "yield from 1"
 o: "1 < 2"
 p: "call()"
--- a/crates/red_knot_python_semantic/resources/mdtest/annotations/unsupported_special_forms.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/annotations/unsupported_special_forms.md
@@ -0,0 +1,71 @@
+# Unsupported special forms
+
+## Not yet supported
+
+Several special forms are unsupported by red-knot currently. However, we also don't emit
+false-positive errors if you use one in an annotation:
+
+```py
+from typing_extensions import Self, TypeVarTuple, Unpack, TypeGuard, TypeIs, Concatenate, ParamSpec, TypeAlias, Callable, TypeVar
+
+P = ParamSpec("P")
+Ts = TypeVarTuple("Ts")
+R_co = TypeVar("R_co", covariant=True)
+
+Alias: TypeAlias = int
+
+def f(*args: Unpack[Ts]) -> tuple[Unpack[Ts]]:
+    # TODO: should understand the annotation
+    reveal_type(args)  # revealed: tuple
+
+    reveal_type(Alias)  # revealed: @Todo(Unsupported or invalid type in a type expression)
+
+def g() -> TypeGuard[int]: ...
+def h() -> TypeIs[int]: ...
+def i(callback: Callable[Concatenate[int, P], R_co], *args: P.args, **kwargs: P.kwargs) -> R_co:
+    # TODO: should understand the annotation
+    reveal_type(args)  # revealed: tuple
+
+    # TODO: should understand the annotation
+    reveal_type(kwargs)  # revealed: dict
+
+    return callback(42, *args, **kwargs)
+
+class Foo:
+    def method(self, x: Self):
+        reveal_type(x)  # revealed: @Todo(Unsupported or invalid type in a type expression)
+```
+
+## Inheritance
+
+You can't inherit from most of these. `typing.Callable` is an exception.
+
+```py
+from typing import Callable
+from typing_extensions import Self, Unpack, TypeGuard, TypeIs, Concatenate
+
+class A(Self): ...  # error: [invalid-base]
+class B(Unpack): ...  # error: [invalid-base]
+class C(TypeGuard): ...  # error: [invalid-base]
+class D(TypeIs): ...  # error: [invalid-base]
+class E(Concatenate): ...  # error: [invalid-base]
+class F(Callable): ...
+
+reveal_type(F.__mro__)  # revealed: tuple[Literal[F], @Todo(Support for more typing aliases as base classes), Literal[object]]
+```
+
+## Subscriptability
+
+Some of these are not subscriptable:
+
+```py
+from typing_extensions import Self, TypeAlias
+
+X: TypeAlias[T] = int  # error: [invalid-type-parameter]
+
+class Foo[T]:
+    # error: [invalid-type-parameter] "Special form `typing.Self` expected no type parameter"
+    # error: [invalid-type-parameter] "Special form `typing.Self` expected no type parameter"
+    def method(self: Self[int]) -> Self[int]:
+        reveal_type(self)  # revealed: Unknown
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/annotations/unsupported_type_qualifiers.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/annotations/unsupported_type_qualifiers.md
@@ -0,0 +1,37 @@
+# Unsupported type qualifiers
+
+## Not yet supported
+
+Several type qualifiers are unsupported by red-knot currently. However, we also don't emit
+false-positive errors if you use one in an annotation:
+
+```py
+from typing_extensions import Final, ClassVar, Required, NotRequired, ReadOnly, TypedDict
+
+X: Final = 42
+Y: Final[int] = 42
+
+class Foo:
+    A: ClassVar[int] = 42
+
+# TODO: `TypedDict` is actually valid as a base
+# error: [invalid-base]
+class Bar(TypedDict):
+    x: Required[int]
+    y: NotRequired[str]
+    z: ReadOnly[bytes]
+```
+
+## Inheritance
+
+You can't inherit from a type qualifier.
+
+```py
+from typing_extensions import Final, ClassVar, Required, NotRequired, ReadOnly
+
+class A(Final): ...  # error: [invalid-base]
+class B(ClassVar): ...  # error: [invalid-base]
+class C(Required): ...  # error: [invalid-base]
+class D(NotRequired): ...  # error: [invalid-base]
+class E(ReadOnly): ...  # error: [invalid-base]
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/assignment/annotations.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/assignment/annotations.md
@@ -50,7 +50,7 @@ reveal_type(b)  # revealed: tuple[int]
 reveal_type(c)  # revealed: tuple[str, int]
 reveal_type(d)  # revealed: tuple[tuple[str, str], tuple[int, int]]

-# TODO: homogenous tuples, PEP-646 tuples
+# TODO: homogeneous tuples, PEP-646 tuples
 reveal_type(e)  # revealed: @Todo(full tuple[...] support)
 reveal_type(f)  # revealed: @Todo(full tuple[...] support)
 reveal_type(g)  # revealed: @Todo(full tuple[...] support)
@@ -78,20 +78,10 @@ c: tuple[str | int, str] = ([], "foo")
 ## PEP-604 annotations are supported

 ```py
-def foo() -> str | int | None:
-    return None
-
-reveal_type(foo())  # revealed: str | int | None
-
-def bar() -> str | str | None:
-    return None
-
-reveal_type(bar())  # revealed: str | None
-
-def baz() -> str | str:
-    return "Hello, world!"
-
-reveal_type(baz())  # revealed: str
+def foo(v: str | int | None, w: str | str | None, x: str | str):
+    reveal_type(v)  # revealed: str | int | None
+    reveal_type(w)  # revealed: str | None
+    reveal_type(x)  # revealed: str
 ```

 ## Attribute expressions in type annotations are understood
@@ -118,8 +108,7 @@ from __future__ import annotations

 x: Foo

-class Foo:
-    pass
+class Foo: ...

 x = Foo()
 reveal_type(x)  # revealed: Foo
@@ -130,8 +119,7 @@ reveal_type(x)  # revealed: Foo
 ```pyi path=main.pyi
 x: Foo

-class Foo:
-    pass
+class Foo: ...

 x = Foo()
 reveal_type(x)  # revealed: Foo
--- a/crates/red_knot_python_semantic/resources/mdtest/assignment/augmented.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/assignment/augmented.md
@@ -49,134 +49,116 @@ reveal_type(x)  # revealed: int
 ## Method union

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    class Foo:
+        if flag:
+            def __iadd__(self, other: int) -> str:
+                return "Hello, world!"
+        else:
+            def __iadd__(self, other: int) -> int:
+                return 42

-flag = bool_instance()
+    f = Foo()
+    f += 12

-class Foo:
-    if bool_instance():
-        def __iadd__(self, other: int) -> str:
-            return "Hello, world!"
-    else:
-        def __iadd__(self, other: int) -> int:
-            return 42
-
-f = Foo()
-f += 12
-
-reveal_type(f)  # revealed: str | int
+    reveal_type(f)  # revealed: str | int
 ```

 ## Partially bound `__iadd__`

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    class Foo:
+        if flag:
+            def __iadd__(self, other: str) -> int:
+                return 42

-class Foo:
-    if bool_instance():
-        def __iadd__(self, other: str) -> int:
-            return 42
+    f = Foo()

-f = Foo()
+    # TODO: We should emit an `unsupported-operator` error here, possibly with the information
+    # that `Foo.__iadd__` may be unbound as additional context.
+    f += "Hello, world!"

-# TODO: We should emit an `unsupported-operator` error here, possibly with the information
-# that `Foo.__iadd__` may be unbound as additional context.
-f += "Hello, world!"
-
-reveal_type(f)  # revealed: int | Unknown
+    reveal_type(f)  # revealed: int | Unknown
 ```

 ## Partially bound with `__add__`

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    class Foo:
+        def __add__(self, other: str) -> str:
+            return "Hello, world!"
+        if flag:
+            def __iadd__(self, other: str) -> int:
+                return 42

-class Foo:
-    def __add__(self, other: str) -> str:
-        return "Hello, world!"
-    if bool_instance():
-        def __iadd__(self, other: str) -> int:
-            return 42
+    f = Foo()
+    f += "Hello, world!"

-f = Foo()
-f += "Hello, world!"
-
-reveal_type(f)  # revealed: int | str
+    reveal_type(f)  # revealed: int | str
 ```

 ## Partially bound target union

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag1: bool, flag2: bool):
+    class Foo:
+        def __add__(self, other: int) -> str:
+            return "Hello, world!"
+        if flag1:
+            def __iadd__(self, other: int) -> int:
+                return 42

-class Foo:
-    def __add__(self, other: int) -> str:
-        return "Hello, world!"
-    if bool_instance():
-        def __iadd__(self, other: int) -> int:
-            return 42
+    if flag2:
+        f = Foo()
+    else:
+        f = 42.0
+    f += 12

-if bool_instance():
-    f = Foo()
-else:
-    f = 42.0
-f += 12
-
-reveal_type(f)  # revealed: int | str | float
+    reveal_type(f)  # revealed: int | str | float
 ```

 ## Target union

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    class Foo:
+        def __iadd__(self, other: int) -> str:
+            return "Hello, world!"

-flag = bool_instance()
+    if flag:
+        f = Foo()
+    else:
+        f = 42.0
+    f += 12

-class Foo:
-    def __iadd__(self, other: int) -> str:
-        return "Hello, world!"
-
-if flag:
-    f = Foo()
-else:
-    f = 42.0
-f += 12
-
-reveal_type(f)  # revealed: str | float
+    reveal_type(f)  # revealed: str | float
 ```

 ## Partially bound target union with `__add__`

 ```py
-def bool_instance() -> bool:
-    return True
+def f(flag: bool, flag2: bool):
+    class Foo:
+        def __add__(self, other: int) -> str:
+            return "Hello, world!"
+        if flag:
+            def __iadd__(self, other: int) -> int:
+                return 42

-flag = bool_instance()
+    class Bar:
+        def __add__(self, other: int) -> bytes:
+            return b"Hello, world!"

-class Foo:
-    def __add__(self, other: int) -> str:
-        return "Hello, world!"
-    if bool_instance():
-        def __iadd__(self, other: int) -> int:
-            return 42
+        def __iadd__(self, other: int) -> float:
+            return 42.0

-class Bar:
-    def __add__(self, other: int) -> bytes:
-        return b"Hello, world!"
+    if flag2:
+        f = Foo()
+    else:
+        f = Bar()
+    f += 12

-    def __iadd__(self, other: int) -> float:
-        return 42.0
-
-if flag:
-    f = Foo()
-else:
-    f = Bar()
-f += 12
-
-reveal_type(f)  # revealed: int | str | float
+    reveal_type(f)  # revealed: int | str | float
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/assignment/unbound.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/assignment/unbound.md
@@ -18,43 +18,3 @@ Note: in this particular example, one could argue that the most likely error wou
 of the `x`/`foo` definitions, and so it could be desirable to infer `Literal[1]` for the type of
 `x`. On the other hand, there might be a variable `fob` a little higher up in this file, and the
 actual error might have been just a typo. Inferring `Unknown` thus seems like the safest option.
-
-## Unbound class variable
-
-Name lookups within a class scope fall back to globals, but lookups of class attributes don't.
-
-```py
-def bool_instance() -> bool:
-    return True
-
-flag = bool_instance()
-x = 1
-
-class C:
-    y = x
-    if flag:
-        x = 2
-
-# error: [possibly-unbound-attribute] "Attribute `x` on type `Literal[C]` is possibly unbound"
-reveal_type(C.x)  # revealed: Literal[2]
-reveal_type(C.y)  # revealed: Literal[1]
-```
-
-## Possibly unbound in class and global scope
-
-```py
-def bool_instance() -> bool:
-    return True
-
-if bool_instance():
-    x = "abc"
-
-class C:
-    if bool_instance():
-        x = 1
-
-    # error: [possibly-unresolved-reference]
-    y = x
-
-reveal_type(C.y)  # revealed: Literal[1] | Literal["abc"]
-```
--- a/crates/red_knot_python_semantic/resources/mdtest/attributes.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/attributes.md
@@ -3,27 +3,23 @@
 ## Union of attributes

 ```py
-def bool_instance() -> bool:
-    return True
-
-flag = bool_instance()
-
-if flag:
-    class C1:
-        x = 1
-
-else:
-    class C1:
-        x = 2
-
-class C2:
+def _(flag: bool):
    if flag:
-        x = 3
-    else:
-        x = 4
+        class C1:
+            x = 1

-reveal_type(C1.x)  # revealed: Literal[1, 2]
-reveal_type(C2.x)  # revealed: Literal[3, 4]
+    else:
+        class C1:
+            x = 2
+
+    class C2:
+        if flag:
+            x = 3
+        else:
+            x = 4
+
+    reveal_type(C1.x)  # revealed: Literal[1, 2]
+    reveal_type(C2.x)  # revealed: Literal[3, 4]
 ```

 ## Inherited attributes
@@ -68,24 +64,19 @@ reveal_type(A.X)  # revealed: Literal[42]
 In this example, the `x` attribute is not defined in the `C2` element of the union:

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag1: bool, flag2: bool):
+    class C1:
+        x = 1

-class C1:
-    x = 1
+    class C2: ...

-class C2: ...
+    class C3:
+        x = 3

-class C3:
-    x = 3
+    C = C1 if flag1 else C2 if flag2 else C3

-flag1 = bool_instance()
-flag2 = bool_instance()
-
-C = C1 if flag1 else C2 if flag2 else C3
-
-# error: [possibly-unbound-attribute] "Attribute `x` on type `Literal[C1, C2, C3]` is possibly unbound"
-reveal_type(C.x)  # revealed: Literal[1, 3]
+    # error: [possibly-unbound-attribute] "Attribute `x` on type `Literal[C1, C2, C3]` is possibly unbound"
+    reveal_type(C.x)  # revealed: Literal[1, 3]
 ```

 ### Possibly-unbound within a class
@@ -94,26 +85,21 @@ We raise the same diagnostic if the attribute is possibly-unbound in at least on
 union:

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool, flag1: bool, flag2: bool):
+    class C1:
+        x = 1

-class C1:
-    x = 1
+    class C2:
+        if flag:
+            x = 2

-class C2:
-    if bool_instance():
-        x = 2
+    class C3:
+        x = 3

-class C3:
-    x = 3
+    C = C1 if flag1 else C2 if flag2 else C3

-flag1 = bool_instance()
-flag2 = bool_instance()
-
-C = C1 if flag1 else C2 if flag2 else C3
-
-# error: [possibly-unbound-attribute] "Attribute `x` on type `Literal[C1, C2, C3]` is possibly unbound"
-reveal_type(C.x)  # revealed: Literal[1, 2, 3]
+    # error: [possibly-unbound-attribute] "Attribute `x` on type `Literal[C1, C2, C3]` is possibly unbound"
+    reveal_type(C.x)  # revealed: Literal[1, 2, 3]
 ```

 ## Unions with all paths unbound
@@ -121,16 +107,51 @@ reveal_type(C.x)  # revealed: Literal[1, 2, 3]
 If the symbol is unbound in all elements of the union, we detect that:

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    class C1: ...
+    class C2: ...
+    C = C1 if flag else C2

-class C1: ...
-class C2: ...
-
-flag = bool_instance()
-
-C = C1 if flag else C2
-
-# error: [unresolved-attribute] "Type `Literal[C1, C2]` has no attribute `x`"
-reveal_type(C.x)  # revealed: Unknown
+    # error: [unresolved-attribute] "Type `Literal[C1, C2]` has no attribute `x`"
+    reveal_type(C.x)  # revealed: Unknown
+```
+
+## Objects of all types have a `__class__` method
+
+```py
+import typing_extensions
+
+reveal_type(typing_extensions.__class__)  # revealed: Literal[ModuleType]
+
+a = 42
+reveal_type(a.__class__)  # revealed: Literal[int]
+
+b = "42"
+reveal_type(b.__class__)  # revealed: Literal[str]
+
+c = b"42"
+reveal_type(c.__class__)  # revealed: Literal[bytes]
+
+d = True
+reveal_type(d.__class__)  # revealed: Literal[bool]
+
+e = (42, 42)
+reveal_type(e.__class__)  # revealed: Literal[tuple]
+
+def f(a: int, b: typing_extensions.LiteralString, c: int | str, d: type[str]):
+    reveal_type(a.__class__)  # revealed: type[int]
+    reveal_type(b.__class__)  # revealed: Literal[str]
+    reveal_type(c.__class__)  # revealed: type[int] | type[str]
+
+    # `type[type]`, a.k.a., either the class `type` or some subclass of `type`.
+    # It would be incorrect to infer `Literal[type]` here,
+    # as `c` could be some subclass of `str` with a custom metaclass.
+    # All we know is that the metaclass must be a (non-strict) subclass of `type`.
+    reveal_type(d.__class__)  # revealed: type[type]
+
+reveal_type(f.__class__)  # revealed: Literal[FunctionType]
+
+class Foo: ...
+
+reveal_type(Foo.__class__)  # revealed: Literal[type]
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/binary/instances.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/binary/instances.md
@@ -281,20 +281,12 @@ reveal_type(42 + 4.2)  # revealed: int
 # TODO should be complex, need to check arg type and fall back to `rhs.__radd__`
 reveal_type(3 + 3j)  # revealed: int

-def returns_int() -> int:
-    return 42
+def _(x: bool, y: int):
+    reveal_type(x + y)  # revealed: int
+    reveal_type(4.2 + x)  # revealed: float

-def returns_bool() -> bool:
-    return True
-
-x = returns_bool()
-y = returns_int()
-
-reveal_type(x + y)  # revealed: int
-reveal_type(4.2 + x)  # revealed: float
-
-# TODO should be float, need to check arg type and fall back to `rhs.__radd__`
-reveal_type(y + 4.12)  # revealed: int
+    # TODO should be float, need to check arg type and fall back to `rhs.__radd__`
+    reveal_type(y + 4.12)  # revealed: int
 ```

 ## With literal types
--- a/crates/red_knot_python_semantic/resources/mdtest/boolean/short_circuit.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/boolean/short_circuit.md
@@ -7,29 +7,25 @@ Similarly, in `and` expressions, if the left-hand side is falsy, the right-hand
 evaluated.

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    if flag or (x := 1):
+        # error: [possibly-unresolved-reference]
+        reveal_type(x)  # revealed: Literal[1]

-if bool_instance() or (x := 1):
-    # error: [possibly-unresolved-reference]
-    reveal_type(x)  # revealed: Literal[1]
-
-if bool_instance() and (x := 1):
-    # error: [possibly-unresolved-reference]
-    reveal_type(x)  # revealed: Literal[1]
+    if flag and (x := 1):
+        # error: [possibly-unresolved-reference]
+        reveal_type(x)  # revealed: Literal[1]
 ```

 ## First expression is always evaluated

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    if (x := 1) or flag:
+        reveal_type(x)  # revealed: Literal[1]

-if (x := 1) or bool_instance():
-    reveal_type(x)  # revealed: Literal[1]
-
-if (x := 1) and bool_instance():
-    reveal_type(x)  # revealed: Literal[1]
+    if (x := 1) and flag:
+        reveal_type(x)  # revealed: Literal[1]
 ```

 ## Statically known truthiness
@@ -49,30 +45,26 @@ if True and (x := 1):
 ## Later expressions can always use variables from earlier expressions

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    flag or (x := 1) or reveal_type(x)  # revealed: Literal[1]

-bool_instance() or (x := 1) or reveal_type(x)  # revealed: Literal[1]
-
-# error: [unresolved-reference]
-bool_instance() or reveal_type(y) or (y := 1)  # revealed: Unknown
+    # error: [unresolved-reference]
+    flag or reveal_type(y) or (y := 1)  # revealed: Unknown
 ```

 ## Nested expressions

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag1: bool, flag2: bool):
+    if flag1 or ((x := 1) and flag2):
+        # error: [possibly-unresolved-reference]
+        reveal_type(x)  # revealed: Literal[1]
+
+    if ((y := 1) and flag1) or flag2:
+        reveal_type(y)  # revealed: Literal[1]

-if bool_instance() or ((x := 1) and bool_instance()):
    # error: [possibly-unresolved-reference]
-    reveal_type(x)  # revealed: Literal[1]
-
-if ((y := 1) and bool_instance()) or bool_instance():
-    reveal_type(y)  # revealed: Literal[1]
-
-# error: [possibly-unresolved-reference]
-if (bool_instance() and (z := 1)) or reveal_type(z):  # revealed: Literal[1]
-    # error: [possibly-unresolved-reference]
-    reveal_type(z)  # revealed: Literal[1]
+    if (flag1 and (z := 1)) or reveal_type(z):  # revealed: Literal[1]
+        # error: [possibly-unresolved-reference]
+        reveal_type(z)  # revealed: Literal[1]
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/call/callable_instance.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/call/callable_instance.md
@@ -22,29 +22,27 @@ reveal_type(b)  # revealed: Unknown
 ## Possibly unbound `__call__` method

 ```py
-def flag() -> bool: ...
+def _(flag: bool):
+    class PossiblyNotCallable:
+        if flag:
+            def __call__(self) -> int: ...

-class PossiblyNotCallable:
-    if flag():
-        def __call__(self) -> int: ...
-
-a = PossiblyNotCallable()
-result = a()  # error: "Object of type `PossiblyNotCallable` is not callable (possibly unbound `__call__` method)"
-reveal_type(result)  # revealed: int
+    a = PossiblyNotCallable()
+    result = a()  # error: "Object of type `PossiblyNotCallable` is not callable (possibly unbound `__call__` method)"
+    reveal_type(result)  # revealed: int
 ```

 ## Possibly unbound callable

 ```py
-def flag() -> bool: ...
+def _(flag: bool):
+    if flag:
+        class PossiblyUnbound:
+            def __call__(self) -> int: ...

-if flag():
-    class PossiblyUnbound:
-        def __call__(self) -> int: ...
-
-# error: [possibly-unresolved-reference]
-a = PossiblyUnbound()
-reveal_type(a())  # revealed: int
+    # error: [possibly-unresolved-reference]
+    a = PossiblyUnbound()
+    reveal_type(a())  # revealed: int
 ```

 ## Non-callable `__call__`
@@ -61,15 +59,14 @@ reveal_type(a())  # revealed: Unknown
 ## Possibly non-callable `__call__`

 ```py
-def flag() -> bool: ...
+def _(flag: bool):
+    class NonCallable:
+        if flag:
+            __call__ = 1
+        else:
+            def __call__(self) -> int: ...

-class NonCallable:
-    if flag():
-        __call__ = 1
-    else:
-        def __call__(self) -> int: ...
-
-a = NonCallable()
-# error: "Object of type `Literal[1] | Literal[__call__]` is not callable (due to union element `Literal[1]`)"
-reveal_type(a())  # revealed: Unknown | int
+    a = NonCallable()
+    # error: "Object of type `Literal[1] | Literal[__call__]` is not callable (due to union element `Literal[1]`)"
+    reveal_type(a())  # revealed: Unknown | int
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/call/function.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/call/function.md
@@ -57,12 +57,10 @@ x = nonsense()  # error: "Object of type `Literal[123]` is not callable"
 ## Potentially unbound function

 ```py
-def flag() -> bool: ...
-
-if flag():
-    def foo() -> int:
-        return 42
-
-# error: [possibly-unresolved-reference]
-reveal_type(foo())  # revealed: int
+def _(flag: bool):
+    if flag:
+        def foo() -> int:
+            return 42
+    # error: [possibly-unresolved-reference]
+    reveal_type(foo())  # revealed: int
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/call/union.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/call/union.md
@@ -3,22 +3,14 @@
 ## Union of return types

 ```py
-def bool_instance() -> bool:
-    return True
-
-flag = bool_instance()
-
-if flag:
-
-    def f() -> int:
-        return 1
-
-else:
-
-    def f() -> str:
-        return "foo"
-
-reveal_type(f())  # revealed: int | str
+def _(flag: bool):
+    if flag:
+        def f() -> int:
+            return 1
+    else:
+        def f() -> str:
+            return "foo"
+    reveal_type(f())  # revealed: int | str
 ```

 ## Calling with an unknown union
@@ -26,13 +18,10 @@ reveal_type(f())  # revealed: int | str
 ```py
 from nonexistent import f  # error: [unresolved-import] "Cannot resolve import `nonexistent`"

-def bool_instance() -> bool:
+def coinflip() -> bool:
    return True

-flag = bool_instance()
-
-if flag:
-
+if coinflip():
    def f() -> int:
        return 1

@@ -44,20 +33,14 @@ reveal_type(f())  # revealed: Unknown | int
 Calling a union with a non-callable element should emit a diagnostic.

 ```py
-def bool_instance() -> bool:
-    return True
-
-flag = bool_instance()
-
-if flag:
-    f = 1
-else:
-
-    def f() -> int:
-        return 1
-
-x = f()  # error: "Object of type `Literal[1] | Literal[f]` is not callable (due to union element `Literal[1]`)"
-reveal_type(x)  # revealed: Unknown | int
+def _(flag: bool):
+    if flag:
+        f = 1
+    else:
+        def f() -> int:
+            return 1
+    x = f()  # error: "Object of type `Literal[1] | Literal[f]` is not callable (due to union element `Literal[1]`)"
+    reveal_type(x)  # revealed: Unknown | int
 ```

 ## Multiple non-callable elements in a union
@@ -65,23 +48,17 @@ reveal_type(x)  # revealed: Unknown | int
 Calling a union with multiple non-callable elements should mention all of them in the diagnostic.

 ```py
-def bool_instance() -> bool:
-    return True
-
-flag, flag2 = bool_instance(), bool_instance()
-
-if flag:
-    f = 1
-elif flag2:
-    f = "foo"
-else:
-
-    def f() -> int:
-        return 1
-
-# error: "Object of type `Literal[1] | Literal["foo"] | Literal[f]` is not callable (due to union elements Literal[1], Literal["foo"])"
-# revealed: Unknown | int
-reveal_type(f())
+def _(flag: bool, flag2: bool):
+    if flag:
+        f = 1
+    elif flag2:
+        f = "foo"
+    else:
+        def f() -> int:
+            return 1
+    # error: "Object of type `Literal[1] | Literal["foo"] | Literal[f]` is not callable (due to union elements Literal[1], Literal["foo"])"
+    # revealed: Unknown | int
+    reveal_type(f())
 ```

 ## All non-callable union elements
@@ -89,16 +66,12 @@ reveal_type(f())
 Calling a union with no callable elements can emit a simpler diagnostic.

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    if flag:
+        f = 1
+    else:
+        f = "foo"

-flag = bool_instance()
-
-if flag:
-    f = 1
-else:
-    f = "foo"
-
-x = f()  # error: "Object of type `Literal[1] | Literal["foo"]` is not callable"
-reveal_type(x)  # revealed: Unknown
+    x = f()  # error: "Object of type `Literal[1] | Literal["foo"]` is not callable"
+    reveal_type(x)  # revealed: Unknown
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/comparison/identity.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/comparison/identity.md
@@ -3,38 +3,31 @@
 ```py
 class A: ...

-def get_a() -> A: ...
-def get_object() -> object: ...
+def _(a1: A, a2: A, o: object):
+    n1 = None
+    n2 = None

-a1 = get_a()
-a2 = get_a()
+    reveal_type(a1 is a1)  # revealed: bool
+    reveal_type(a1 is a2)  # revealed: bool

-n1 = None
-n2 = None
+    reveal_type(n1 is n1)  # revealed: Literal[True]
+    reveal_type(n1 is n2)  # revealed: Literal[True]

-o = get_object()
+    reveal_type(a1 is n1)  # revealed: Literal[False]
+    reveal_type(n1 is a1)  # revealed: Literal[False]

-reveal_type(a1 is a1)  # revealed: bool
-reveal_type(a1 is a2)  # revealed: bool
+    reveal_type(a1 is o)  # revealed: bool
+    reveal_type(n1 is o)  # revealed: bool

-reveal_type(n1 is n1)  # revealed: Literal[True]
-reveal_type(n1 is n2)  # revealed: Literal[True]
+    reveal_type(a1 is not a1)  # revealed: bool
+    reveal_type(a1 is not a2)  # revealed: bool

-reveal_type(a1 is n1)  # revealed: Literal[False]
-reveal_type(n1 is a1)  # revealed: Literal[False]
+    reveal_type(n1 is not n1)  # revealed: Literal[False]
+    reveal_type(n1 is not n2)  # revealed: Literal[False]

-reveal_type(a1 is o)  # revealed: bool
-reveal_type(n1 is o)  # revealed: bool
+    reveal_type(a1 is not n1)  # revealed: Literal[True]
+    reveal_type(n1 is not a1)  # revealed: Literal[True]

-reveal_type(a1 is not a1)  # revealed: bool
-reveal_type(a1 is not a2)  # revealed: bool
-
-reveal_type(n1 is not n1)  # revealed: Literal[False]
-reveal_type(n1 is not n2)  # revealed: Literal[False]
-
-reveal_type(a1 is not n1)  # revealed: Literal[True]
-reveal_type(n1 is not a1)  # revealed: Literal[True]
-
-reveal_type(a1 is not o)  # revealed: bool
-reveal_type(n1 is not o)  # revealed: bool
+    reveal_type(a1 is not o)  # revealed: bool
+    reveal_type(n1 is not o)  # revealed: bool
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/comparison/instances/rich_comparison.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/comparison/instances/rich_comparison.md
@@ -312,17 +312,9 @@ reveal_type(1 <= 2j)  # revealed: bool
 reveal_type(1 > 2j)  # revealed: bool
 reveal_type(1 >= 2j)  # revealed: bool

-def bool_instance() -> bool:
-    return True
-
-def int_instance() -> int:
-    return 42
-
-x = bool_instance()
-y = int_instance()
-
-reveal_type(x < y)  # revealed: bool
-reveal_type(y < x)  # revealed: bool
-reveal_type(4.2 < x)  # revealed: bool
-reveal_type(x < 4.2)  # revealed: bool
+def f(x: bool, y: int):
+    reveal_type(x < y)  # revealed: bool
+    reveal_type(y < x)  # revealed: bool
+    reveal_type(4.2 < x)  # revealed: bool
+    reveal_type(x < 4.2)  # revealed: bool
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/comparison/integers.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/comparison/integers.md
@@ -20,10 +20,8 @@ reveal_type(1 <= "" and 0 < 1)  # revealed: bool

 ```py
 # TODO: implement lookup of `__eq__` on typeshed `int` stub.
-def int_instance() -> int:
-    return 42
-
-reveal_type(1 == int_instance())  # revealed: bool
-reveal_type(9 < int_instance())  # revealed: bool
-reveal_type(int_instance() < int_instance())  # revealed: bool
+def _(a: int, b: int):
+    reveal_type(1 == a)  # revealed: bool
+    reveal_type(9 < a)  # revealed: bool
+    reveal_type(a < b)  # revealed: bool
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/comparison/intersections.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/comparison/intersections.md
@@ -14,21 +14,19 @@ class Child1(Base):

 class Child2(Base): ...

-def get_base() -> Base: ...
+def _(x: Base):
+    c1 = Child1()

-x = get_base()
-c1 = Child1()
+    # Create an intersection type through narrowing:
+    if isinstance(x, Child1):
+        if isinstance(x, Child2):
+            reveal_type(x)  # revealed: Child1 & Child2

-# Create an intersection type through narrowing:
-if isinstance(x, Child1):
-    if isinstance(x, Child2):
-        reveal_type(x)  # revealed: Child1 & Child2
+            reveal_type(x == 1)  # revealed: Literal[True]

-        reveal_type(x == 1)  # revealed: Literal[True]
-
-        # Other comparison operators fall back to the base type:
-        reveal_type(x > 1)  # revealed: bool
-        reveal_type(x is c1)  # revealed: bool
+            # Other comparison operators fall back to the base type:
+            reveal_type(x > 1)  # revealed: bool
+            reveal_type(x is c1)  # revealed: bool
 ```

 ## Negative contributions
@@ -73,18 +71,15 @@ if x != "abc":
 #### Integers

 ```py
-def get_int() -> int: ...
+def _(x: int):
+    if x != 1:
+        reveal_type(x)  # revealed: int & ~Literal[1]

-x = get_int()
+        reveal_type(x != 1)  # revealed: Literal[True]
+        reveal_type(x != 2)  # revealed: bool

-if x != 1:
-    reveal_type(x)  # revealed: int & ~Literal[1]
-
-    reveal_type(x != 1)  # revealed: Literal[True]
-    reveal_type(x != 2)  # revealed: bool
-
-    reveal_type(x == 1)  # revealed: Literal[False]
-    reveal_type(x == 2)  # revealed: bool
+        reveal_type(x == 1)  # revealed: Literal[False]
+        reveal_type(x == 2)  # revealed: bool
 ```

 ### Identity comparisons
@@ -92,18 +87,15 @@ if x != 1:
 ```py
 class A: ...

-def get_object() -> object: ...
+def _(o: object):
+    a = A()
+    n = None

-o = object()
+    if o is not None:
+        reveal_type(o)  # revealed: object & ~None

-a = A()
-n = None
-
-if o is not None:
-    reveal_type(o)  # revealed: object & ~None
-
-    reveal_type(o is n)  # revealed: Literal[False]
-    reveal_type(o is not n)  # revealed: Literal[True]
+        reveal_type(o is n)  # revealed: Literal[False]
+        reveal_type(o is not n)  # revealed: Literal[True]
 ```

 ## Diagnostics
@@ -119,16 +111,13 @@ class Container:

 class NonContainer: ...

-def get_object() -> object: ...
+def _(x: object):
+    if isinstance(x, Container):
+        if isinstance(x, NonContainer):
+            reveal_type(x)  # revealed: Container & NonContainer

-x = get_object()
-
-if isinstance(x, Container):
-    if isinstance(x, NonContainer):
-        reveal_type(x)  # revealed: Container & NonContainer
-
-        # error: [unsupported-operator] "Operator `in` is not supported for types `int` and `NonContainer`"
-        reveal_type(2 in x)  # revealed: bool
+            # error: [unsupported-operator] "Operator `in` is not supported for types `int` and `NonContainer`"
+            reveal_type(2 in x)  # revealed: bool
 ```

 ### Unsupported operators for negative contributions
@@ -142,14 +131,11 @@ class Container:

 class NonContainer: ...

-def get_object() -> object: ...
+def _(x: object):
+    if isinstance(x, Container):
+        if not isinstance(x, NonContainer):
+            reveal_type(x)  # revealed: Container & ~NonContainer

-x = get_object()
-
-if isinstance(x, Container):
-    if not isinstance(x, NonContainer):
-        reveal_type(x)  # revealed: Container & ~NonContainer
-
-        # No error here!
-        reveal_type(2 in x)  # revealed: bool
+            # No error here!
+            reveal_type(2 in x)  # revealed: bool
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/comparison/strings.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/comparison/strings.md
@@ -3,18 +3,17 @@
 ## String literals

 ```py
-def str_instance() -> str: ...
+def _(x: str):
+    reveal_type("abc" == "abc")  # revealed: Literal[True]
+    reveal_type("ab_cd" <= "ab_ce")  # revealed: Literal[True]
+    reveal_type("abc" in "ab cd")  # revealed: Literal[False]
+    reveal_type("" not in "hello")  # revealed: Literal[False]
+    reveal_type("--" is "--")  # revealed: bool
+    reveal_type("A" is "B")  # revealed: Literal[False]
+    reveal_type("--" is not "--")  # revealed: bool
+    reveal_type("A" is not "B")  # revealed: Literal[True]
+    reveal_type(x < "...")  # revealed: bool

-reveal_type("abc" == "abc")  # revealed: Literal[True]
-reveal_type("ab_cd" <= "ab_ce")  # revealed: Literal[True]
-reveal_type("abc" in "ab cd")  # revealed: Literal[False]
-reveal_type("" not in "hello")  # revealed: Literal[False]
-reveal_type("--" is "--")  # revealed: bool
-reveal_type("A" is "B")  # revealed: Literal[False]
-reveal_type("--" is not "--")  # revealed: bool
-reveal_type("A" is not "B")  # revealed: Literal[True]
-reveal_type(str_instance() < "...")  # revealed: bool
-
-# ensure we're not comparing the interned salsa symbols, which compare by order of declaration.
-reveal_type("ab" < "ab_cd")  # revealed: Literal[True]
+    # ensure we're not comparing the interned salsa symbols, which compare by order of declaration.
+    reveal_type("ab" < "ab_cd")  # revealed: Literal[True]
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/comparison/tuples.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/comparison/tuples.md
@@ -58,28 +58,23 @@ reveal_type(c >= d)  # revealed: Literal[True]
 #### Results with Ambiguity

 ```py
-def bool_instance() -> bool:
-    return True
+def _(x: bool, y: int):
+    a = (x,)
+    b = (y,)

-def int_instance() -> int:
-    return 42
+    reveal_type(a == a)  # revealed: bool
+    reveal_type(a != a)  # revealed: bool
+    reveal_type(a < a)  # revealed: bool
+    reveal_type(a <= a)  # revealed: bool
+    reveal_type(a > a)  # revealed: bool
+    reveal_type(a >= a)  # revealed: bool

-a = (bool_instance(),)
-b = (int_instance(),)
-
-reveal_type(a == a)  # revealed: bool
-reveal_type(a != a)  # revealed: bool
-reveal_type(a < a)  # revealed: bool
-reveal_type(a <= a)  # revealed: bool
-reveal_type(a > a)  # revealed: bool
-reveal_type(a >= a)  # revealed: bool
-
-reveal_type(a == b)  # revealed: bool
-reveal_type(a != b)  # revealed: bool
-reveal_type(a < b)  # revealed: bool
-reveal_type(a <= b)  # revealed: bool
-reveal_type(a > b)  # revealed: bool
-reveal_type(a >= b)  # revealed: bool
+    reveal_type(a == b)  # revealed: bool
+    reveal_type(a != b)  # revealed: bool
+    reveal_type(a < b)  # revealed: bool
+    reveal_type(a <= b)  # revealed: bool
+    reveal_type(a > b)  # revealed: bool
+    reveal_type(a >= b)  # revealed: bool
 ```

 #### Comparison Unsupported
@@ -197,7 +192,7 @@ reveal_type((A(), B()) < (A(), B()))  # revealed: float | set | Literal[False]

 #### Special Handling of Eq and NotEq in Lexicographic Comparisons

-> Example: `(int_instance(), "foo") == (int_instance(), "bar")`
+> Example: `(<int instance>, "foo") == (<int instance>, "bar")`

 `Eq` and `NotEq` have unique behavior compared to other operators in lexicographic comparisons.
 Specifically, for `Eq`, if any non-equal pair exists within the tuples being compared, we can
@@ -208,42 +203,38 @@ In contrast, with operators like `<` and `>`, the comparison must consider each
 sequentially, and the final outcome might remain ambiguous until all pairs are compared.

 ```py
-def str_instance() -> str:
-    return "hello"
+def _(x: str, y: int):
+    reveal_type("foo" == "bar")  # revealed: Literal[False]
+    reveal_type(("foo",) == ("bar",))  # revealed: Literal[False]
+    reveal_type((4, "foo") == (4, "bar"))  # revealed: Literal[False]
+    reveal_type((y, "foo") == (y, "bar"))  # revealed: Literal[False]

-def int_instance() -> int:
-    return 42
+    a = (x, y, "foo")

-reveal_type("foo" == "bar")  # revealed: Literal[False]
-reveal_type(("foo",) == ("bar",))  # revealed: Literal[False]
-reveal_type((4, "foo") == (4, "bar"))  # revealed: Literal[False]
-reveal_type((int_instance(), "foo") == (int_instance(), "bar"))  # revealed: Literal[False]
+    reveal_type(a == a)  # revealed: bool
+    reveal_type(a != a)  # revealed: bool
+    reveal_type(a < a)  # revealed: bool
+    reveal_type(a <= a)  # revealed: bool
+    reveal_type(a > a)  # revealed: bool
+    reveal_type(a >= a)  # revealed: bool

-a = (str_instance(), int_instance(), "foo")
+    b = (x, y, "bar")

-reveal_type(a == a)  # revealed: bool
-reveal_type(a != a)  # revealed: bool
-reveal_type(a < a)  # revealed: bool
-reveal_type(a <= a)  # revealed: bool
-reveal_type(a > a)  # revealed: bool
-reveal_type(a >= a)  # revealed: bool
+    reveal_type(a == b)  # revealed: Literal[False]
+    reveal_type(a != b)  # revealed: Literal[True]
+    reveal_type(a < b)  # revealed: bool
+    reveal_type(a <= b)  # revealed: bool
+    reveal_type(a > b)  # revealed: bool
+    reveal_type(a >= b)  # revealed: bool

-b = (str_instance(), int_instance(), "bar")
+    c = (x, y, "foo", "different_length")

-reveal_type(a == b)  # revealed: Literal[False]
-reveal_type(a != b)  # revealed: Literal[True]
-reveal_type(a < b)  # revealed: bool
-reveal_type(a <= b)  # revealed: bool
-reveal_type(a > b)  # revealed: bool
-reveal_type(a >= b)  # revealed: bool
-
-c = (str_instance(), int_instance(), "foo", "different_length")
-reveal_type(a == c)  # revealed: Literal[False]
-reveal_type(a != c)  # revealed: Literal[True]
-reveal_type(a < c)  # revealed: bool
-reveal_type(a <= c)  # revealed: bool
-reveal_type(a > c)  # revealed: bool
-reveal_type(a >= c)  # revealed: bool
+    reveal_type(a == c)  # revealed: Literal[False]
+    reveal_type(a != c)  # revealed: Literal[True]
+    reveal_type(a < c)  # revealed: bool
+    reveal_type(a <= c)  # revealed: bool
+    reveal_type(a > c)  # revealed: bool
+    reveal_type(a >= c)  # revealed: bool
 ```

 #### Error Propagation
@@ -252,42 +243,36 @@ Errors occurring within a tuple comparison should propagate outward. However, if
 comparison can clearly conclude before encountering an error, the error should not be raised.

 ```py
-def int_instance() -> int:
-    return 42
+def _(n: int, s: str):
+    class A: ...
+    # error: [unsupported-operator] "Operator `<` is not supported for types `A` and `A`"
+    A() < A()
+    # error: [unsupported-operator] "Operator `<=` is not supported for types `A` and `A`"
+    A() <= A()
+    # error: [unsupported-operator] "Operator `>` is not supported for types `A` and `A`"
+    A() > A()
+    # error: [unsupported-operator] "Operator `>=` is not supported for types `A` and `A`"
+    A() >= A()

-def str_instance() -> str:
-    return "hello"
+    a = (0, n, A())

-class A: ...
+    # error: [unsupported-operator] "Operator `<` is not supported for types `A` and `A`, in comparing `tuple[Literal[0], int, A]` with `tuple[Literal[0], int, A]`"
+    reveal_type(a < a)  # revealed: Unknown
+    # error: [unsupported-operator] "Operator `<=` is not supported for types `A` and `A`, in comparing `tuple[Literal[0], int, A]` with `tuple[Literal[0], int, A]`"
+    reveal_type(a <= a)  # revealed: Unknown
+    # error: [unsupported-operator] "Operator `>` is not supported for types `A` and `A`, in comparing `tuple[Literal[0], int, A]` with `tuple[Literal[0], int, A]`"
+    reveal_type(a > a)  # revealed: Unknown
+    # error: [unsupported-operator] "Operator `>=` is not supported for types `A` and `A`, in comparing `tuple[Literal[0], int, A]` with `tuple[Literal[0], int, A]`"
+    reveal_type(a >= a)  # revealed: Unknown

-# error: [unsupported-operator] "Operator `<` is not supported for types `A` and `A`"
-A() < A()
-# error: [unsupported-operator] "Operator `<=` is not supported for types `A` and `A`"
-A() <= A()
-# error: [unsupported-operator] "Operator `>` is not supported for types `A` and `A`"
-A() > A()
-# error: [unsupported-operator] "Operator `>=` is not supported for types `A` and `A`"
-A() >= A()
+    # Comparison between `a` and `b` should only involve the first elements, `Literal[0]` and `Literal[99999]`,
+    # and should terminate immediately.
+    b = (99999, n, A())

-a = (0, int_instance(), A())
-
-# error: [unsupported-operator] "Operator `<` is not supported for types `A` and `A`, in comparing `tuple[Literal[0], int, A]` with `tuple[Literal[0], int, A]`"
-reveal_type(a < a)  # revealed: Unknown
-# error: [unsupported-operator] "Operator `<=` is not supported for types `A` and `A`, in comparing `tuple[Literal[0], int, A]` with `tuple[Literal[0], int, A]`"
-reveal_type(a <= a)  # revealed: Unknown
-# error: [unsupported-operator] "Operator `>` is not supported for types `A` and `A`, in comparing `tuple[Literal[0], int, A]` with `tuple[Literal[0], int, A]`"
-reveal_type(a > a)  # revealed: Unknown
-# error: [unsupported-operator] "Operator `>=` is not supported for types `A` and `A`, in comparing `tuple[Literal[0], int, A]` with `tuple[Literal[0], int, A]`"
-reveal_type(a >= a)  # revealed: Unknown
-
-# Comparison between `a` and `b` should only involve the first elements, `Literal[0]` and `Literal[99999]`,
-# and should terminate immediately.
-b = (99999, int_instance(), A())
-
-reveal_type(a < b)  # revealed: Literal[True]
-reveal_type(a <= b)  # revealed: Literal[True]
-reveal_type(a > b)  # revealed: Literal[False]
-reveal_type(a >= b)  # revealed: Literal[False]
+    reveal_type(a < b)  # revealed: Literal[True]
+    reveal_type(a <= b)  # revealed: Literal[True]
+    reveal_type(a > b)  # revealed: Literal[False]
+    reveal_type(a >= b)  # revealed: Literal[False]
 ```

 ### Membership Test Comparisons
@@ -295,22 +280,20 @@ reveal_type(a >= b)  # revealed: Literal[False]
 "Membership Test Comparisons" refers to the operators `in` and `not in`.

 ```py
-def int_instance() -> int:
-    return 42
+def _(n: int):
+    a = (1, 2)
+    b = ((3, 4), (1, 2))
+    c = ((1, 2, 3), (4, 5, 6))
+    d = ((n, n), (n, n))

-a = (1, 2)
-b = ((3, 4), (1, 2))
-c = ((1, 2, 3), (4, 5, 6))
-d = ((int_instance(), int_instance()), (int_instance(), int_instance()))
+    reveal_type(a in b)  # revealed: Literal[True]
+    reveal_type(a not in b)  # revealed: Literal[False]

-reveal_type(a in b)  # revealed: Literal[True]
-reveal_type(a not in b)  # revealed: Literal[False]
+    reveal_type(a in c)  # revealed: Literal[False]
+    reveal_type(a not in c)  # revealed: Literal[True]

-reveal_type(a in c)  # revealed: Literal[False]
-reveal_type(a not in c)  # revealed: Literal[True]
-
-reveal_type(a in d)  # revealed: bool
-reveal_type(a not in d)  # revealed: bool
+    reveal_type(a in d)  # revealed: bool
+    reveal_type(a not in d)  # revealed: bool
 ```

 ### Identity Comparisons
--- a/crates/red_knot_python_semantic/resources/mdtest/comparison/unions.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/comparison/unions.md
@@ -5,49 +5,46 @@
 Comparisons on union types need to consider all possible cases:

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    one_or_two = 1 if flag else 2

-flag = bool_instance()
-one_or_two = 1 if flag else 2
+    reveal_type(one_or_two <= 2)  # revealed: Literal[True]
+    reveal_type(one_or_two <= 1)  # revealed: bool
+    reveal_type(one_or_two <= 0)  # revealed: Literal[False]

-reveal_type(one_or_two <= 2)  # revealed: Literal[True]
-reveal_type(one_or_two <= 1)  # revealed: bool
-reveal_type(one_or_two <= 0)  # revealed: Literal[False]
+    reveal_type(2 >= one_or_two)  # revealed: Literal[True]
+    reveal_type(1 >= one_or_two)  # revealed: bool
+    reveal_type(0 >= one_or_two)  # revealed: Literal[False]

-reveal_type(2 >= one_or_two)  # revealed: Literal[True]
-reveal_type(1 >= one_or_two)  # revealed: bool
-reveal_type(0 >= one_or_two)  # revealed: Literal[False]
+    reveal_type(one_or_two < 1)  # revealed: Literal[False]
+    reveal_type(one_or_two < 2)  # revealed: bool
+    reveal_type(one_or_two < 3)  # revealed: Literal[True]

-reveal_type(one_or_two < 1)  # revealed: Literal[False]
-reveal_type(one_or_two < 2)  # revealed: bool
-reveal_type(one_or_two < 3)  # revealed: Literal[True]
+    reveal_type(one_or_two > 0)  # revealed: Literal[True]
+    reveal_type(one_or_two > 1)  # revealed: bool
+    reveal_type(one_or_two > 2)  # revealed: Literal[False]

-reveal_type(one_or_two > 0)  # revealed: Literal[True]
-reveal_type(one_or_two > 1)  # revealed: bool
-reveal_type(one_or_two > 2)  # revealed: Literal[False]
+    reveal_type(one_or_two == 3)  # revealed: Literal[False]
+    reveal_type(one_or_two == 1)  # revealed: bool

-reveal_type(one_or_two == 3)  # revealed: Literal[False]
-reveal_type(one_or_two == 1)  # revealed: bool
+    reveal_type(one_or_two != 3)  # revealed: Literal[True]
+    reveal_type(one_or_two != 1)  # revealed: bool

-reveal_type(one_or_two != 3)  # revealed: Literal[True]
-reveal_type(one_or_two != 1)  # revealed: bool
+    a_or_ab = "a" if flag else "ab"

-a_or_ab = "a" if flag else "ab"
+    reveal_type(a_or_ab in "ab")  # revealed: Literal[True]
+    reveal_type("a" in a_or_ab)  # revealed: Literal[True]

-reveal_type(a_or_ab in "ab")  # revealed: Literal[True]
-reveal_type("a" in a_or_ab)  # revealed: Literal[True]
+    reveal_type("c" not in a_or_ab)  # revealed: Literal[True]
+    reveal_type("a" not in a_or_ab)  # revealed: Literal[False]

-reveal_type("c" not in a_or_ab)  # revealed: Literal[True]
-reveal_type("a" not in a_or_ab)  # revealed: Literal[False]
+    reveal_type("b" in a_or_ab)  # revealed: bool
+    reveal_type("b" not in a_or_ab)  # revealed: bool

-reveal_type("b" in a_or_ab)  # revealed: bool
-reveal_type("b" not in a_or_ab)  # revealed: bool
+    one_or_none = 1 if flag else None

-one_or_none = 1 if flag else None
-
-reveal_type(one_or_none is None)  # revealed: bool
-reveal_type(one_or_none is not None)  # revealed: bool
+    reveal_type(one_or_none is None)  # revealed: bool
+    reveal_type(one_or_none is not None)  # revealed: bool
 ```

 ## Union on both sides of the comparison
@@ -56,18 +53,15 @@ With unions on both sides, we need to consider the full cross product of options
 resulting (union) type:

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag_s: bool, flag_l: bool):
+    small = 1 if flag_s else 2
+    large = 2 if flag_l else 3

-flag_s, flag_l = bool_instance(), bool_instance()
-small = 1 if flag_s else 2
-large = 2 if flag_l else 3
+    reveal_type(small <= large)  # revealed: Literal[True]
+    reveal_type(small >= large)  # revealed: bool

-reveal_type(small <= large)  # revealed: Literal[True]
-reveal_type(small >= large)  # revealed: bool
-
-reveal_type(small < large)  # revealed: bool
-reveal_type(small > large)  # revealed: Literal[False]
+    reveal_type(small < large)  # revealed: bool
+    reveal_type(small > large)  # revealed: Literal[False]
 ```

 ## Unsupported operations
@@ -77,12 +71,9 @@ back to `bool` for the result type instead of trying to infer something more pre
 (supported) variants:

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = [1, 2] if flag else 1

-flag = bool_instance()
-x = [1, 2] if flag else 1
-
-result = 1 in x  # error: "Operator `in` is not supported"
-reveal_type(result)  # revealed: bool
+    result = 1 in x  # error: "Operator `in` is not supported"
+    reveal_type(result)  # revealed: bool
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/comparison/unsupported.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/comparison/unsupported.md
@@ -1,42 +1,38 @@
 # Comparison: Unsupported operators

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool, flag1: bool, flag2: bool):
+    class A: ...
+    a = 1 in 7  # error: "Operator `in` is not supported for types `Literal[1]` and `Literal[7]`"
+    reveal_type(a)  # revealed: bool

-class A: ...
+    b = 0 not in 10  # error: "Operator `not in` is not supported for types `Literal[0]` and `Literal[10]`"
+    reveal_type(b)  # revealed: bool

-a = 1 in 7  # error: "Operator `in` is not supported for types `Literal[1]` and `Literal[7]`"
-reveal_type(a)  # revealed: bool
+    # TODO: should error, once operand type check is implemented
+    # ("Operator `<` is not supported for types `object` and `int`")
+    c = object() < 5
+    # TODO: should be Unknown, once operand type check is implemented
+    reveal_type(c)  # revealed: bool

-b = 0 not in 10  # error: "Operator `not in` is not supported for types `Literal[0]` and `Literal[10]`"
-reveal_type(b)  # revealed: bool
+    # TODO: should error, once operand type check is implemented
+    # ("Operator `<` is not supported for types `int` and `object`")
+    d = 5 < object()
+    # TODO: should be Unknown, once operand type check is implemented
+    reveal_type(d)  # revealed: bool

-# TODO: should error, once operand type check is implemented
-# ("Operator `<` is not supported for types `object` and `int`")
-c = object() < 5
-# TODO: should be Unknown, once operand type check is implemented
-reveal_type(c)  # revealed: bool
+    int_literal_or_str_literal = 1 if flag else "foo"
+    # error: "Operator `in` is not supported for types `Literal[42]` and `Literal[1]`, in comparing `Literal[42]` with `Literal[1] | Literal["foo"]`"
+    e = 42 in int_literal_or_str_literal
+    reveal_type(e)  # revealed: bool

-# TODO: should error, once operand type check is implemented
-# ("Operator `<` is not supported for types `int` and `object`")
-d = 5 < object()
-# TODO: should be Unknown, once operand type check is implemented
-reveal_type(d)  # revealed: bool
+    # TODO: should error, need to check if __lt__ signature is valid for right operand
+    # error may be "Operator `<` is not supported for types `int` and `str`, in comparing `tuple[Literal[1], Literal[2]]` with `tuple[Literal[1], Literal["hello"]]`
+    f = (1, 2) < (1, "hello")
+    # TODO: should be Unknown, once operand type check is implemented
+    reveal_type(f)  # revealed: bool

-flag = bool_instance()
-int_literal_or_str_literal = 1 if flag else "foo"
-# error: "Operator `in` is not supported for types `Literal[42]` and `Literal[1]`, in comparing `Literal[42]` with `Literal[1] | Literal["foo"]`"
-e = 42 in int_literal_or_str_literal
-reveal_type(e)  # revealed: bool
-
-# TODO: should error, need to check if __lt__ signature is valid for right operand
-# error may be "Operator `<` is not supported for types `int` and `str`, in comparing `tuple[Literal[1], Literal[2]]` with `tuple[Literal[1], Literal["hello"]]`
-f = (1, 2) < (1, "hello")
-# TODO: should be Unknown, once operand type check is implemented
-reveal_type(f)  # revealed: bool
-
-# error: [unsupported-operator] "Operator `<` is not supported for types `A` and `A`, in comparing `tuple[bool, A]` with `tuple[bool, A]`"
-g = (bool_instance(), A()) < (bool_instance(), A())
-reveal_type(g)  # revealed: Unknown
+    # error: [unsupported-operator] "Operator `<` is not supported for types `A` and `A`, in comparing `tuple[bool, A]` with `tuple[bool, A]`"
+    g = (flag1, A()) < (flag2, A())
+    reveal_type(g)  # revealed: Unknown
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/conditional/if_expression.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/conditional/if_expression.md
@@ -3,47 +3,35 @@
 ## Simple if-expression

 ```py
-def bool_instance() -> bool:
-    return True
-
-flag = bool_instance()
-x = 1 if flag else 2
-reveal_type(x)  # revealed: Literal[1, 2]
+def _(flag: bool):
+    x = 1 if flag else 2
+    reveal_type(x)  # revealed: Literal[1, 2]
 ```

 ## If-expression with walrus operator

 ```py
-def bool_instance() -> bool:
-    return True
-
-flag = bool_instance()
-y = 0
-z = 0
-x = (y := 1) if flag else (z := 2)
-reveal_type(x)  # revealed: Literal[1, 2]
-reveal_type(y)  # revealed: Literal[0, 1]
-reveal_type(z)  # revealed: Literal[0, 2]
+def _(flag: bool):
+    y = 0
+    z = 0
+    x = (y := 1) if flag else (z := 2)
+    reveal_type(x)  # revealed: Literal[1, 2]
+    reveal_type(y)  # revealed: Literal[0, 1]
+    reveal_type(z)  # revealed: Literal[0, 2]
 ```

 ## Nested if-expression

 ```py
-def bool_instance() -> bool:
-    return True
-
-flag, flag2 = bool_instance(), bool_instance()
-x = 1 if flag else 2 if flag2 else 3
-reveal_type(x)  # revealed: Literal[1, 2, 3]
+def _(flag: bool, flag2: bool):
+    x = 1 if flag else 2 if flag2 else 3
+    reveal_type(x)  # revealed: Literal[1, 2, 3]
 ```

 ## None

 ```py
-def bool_instance() -> bool:
-    return True
-
-flag = bool_instance()
-x = 1 if flag else None
-reveal_type(x)  # revealed: Literal[1] | None
+def _(flag: bool):
+    x = 1 if flag else None
+    reveal_type(x)  # revealed: Literal[1] | None
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/conditional/if_statement.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/conditional/if_statement.md
@@ -3,128 +3,115 @@
 ## Simple if

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    y = 1
+    y = 2

-flag = bool_instance()
-y = 1
-y = 2
+    if flag:
+        y = 3

-if flag:
-    y = 3
-
-reveal_type(y)  # revealed: Literal[2, 3]
+    reveal_type(y)  # revealed: Literal[2, 3]
 ```

 ## Simple if-elif-else

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool, flag2: bool):
+    y = 1
+    y = 2

-flag, flag2 = bool_instance(), bool_instance()
-y = 1
-y = 2
-if flag:
-    y = 3
-elif flag2:
-    y = 4
-else:
-    r = y
-    y = 5
-    s = y
-x = y
+    if flag:
+        y = 3
+    elif flag2:
+        y = 4
+    else:
+        r = y
+        y = 5
+        s = y
+    x = y

-reveal_type(x)  # revealed: Literal[3, 4, 5]
+    reveal_type(x)  # revealed: Literal[3, 4, 5]

-# revealed: Literal[2]
-# error: [possibly-unresolved-reference]
-reveal_type(r)
+    # revealed: Literal[2]
+    # error: [possibly-unresolved-reference]
+    reveal_type(r)

-# revealed: Literal[5]
-# error: [possibly-unresolved-reference]
-reveal_type(s)
+    # revealed: Literal[5]
+    # error: [possibly-unresolved-reference]
+    reveal_type(s)
 ```

 ## Single symbol across if-elif-else

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool, flag2: bool):
+    if flag:
+        y = 1
+    elif flag2:
+        y = 2
+    else:
+        y = 3

-flag, flag2 = bool_instance(), bool_instance()
-
-if flag:
-    y = 1
-elif flag2:
-    y = 2
-else:
-    y = 3
-reveal_type(y)  # revealed: Literal[1, 2, 3]
+    reveal_type(y)  # revealed: Literal[1, 2, 3]
 ```

 ## if-elif-else without else assignment

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool, flag2: bool):
+    y = 0

-flag, flag2 = bool_instance(), bool_instance()
-y = 0
-if flag:
-    y = 1
-elif flag2:
-    y = 2
-else:
-    pass
-reveal_type(y)  # revealed: Literal[0, 1, 2]
+    if flag:
+        y = 1
+    elif flag2:
+        y = 2
+    else:
+        pass
+
+    reveal_type(y)  # revealed: Literal[0, 1, 2]
 ```

 ## if-elif-else with intervening assignment

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool, flag2: bool):
+    y = 0

-flag, flag2 = bool_instance(), bool_instance()
-y = 0
-if flag:
-    y = 1
-    z = 3
-elif flag2:
-    y = 2
-else:
-    pass
-reveal_type(y)  # revealed: Literal[0, 1, 2]
+    if flag:
+        y = 1
+        z = 3
+    elif flag2:
+        y = 2
+    else:
+        pass
+
+    reveal_type(y)  # revealed: Literal[0, 1, 2]
 ```

 ## Nested if statement

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool, flag2: bool):
+    y = 0

-flag, flag2 = bool_instance(), bool_instance()
-y = 0
-if flag:
-    if flag2:
-        y = 1
-reveal_type(y)  # revealed: Literal[0, 1]
+    if flag:
+        if flag2:
+            y = 1
+
+    reveal_type(y)  # revealed: Literal[0, 1]
 ```

 ## if-elif without else

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool, flag2: bool):
+    y = 1
+    y = 2

-flag, flag2 = bool_instance(), bool_instance()
-y = 1
-y = 2
-if flag:
-    y = 3
-elif flag2:
-    y = 4
+    if flag:
+        y = 3
+    elif flag2:
+        y = 4

-reveal_type(y)  # revealed: Literal[2, 3, 4]
+    reveal_type(y)  # revealed: Literal[2, 3, 4]
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/conditional/match.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/conditional/match.md
@@ -3,39 +3,43 @@
 ## With wildcard

 ```py
-match 0:
-    case 1:
-        y = 2
-    case _:
-        y = 3
+def _(target: int):
+    match target:
+        case 1:
+            y = 2
+        case _:
+            y = 3

-reveal_type(y)  # revealed: Literal[2, 3]
+    reveal_type(y)  # revealed: Literal[2, 3]
 ```

 ## Without wildcard

 ```py
-match 0:
-    case 1:
-        y = 2
-    case 2:
-        y = 3
+def _(target: int):
+    match target:
+        case 1:
+            y = 2
+        case 2:
+            y = 3

-# revealed: Literal[2, 3]
-# error: [possibly-unresolved-reference]
-reveal_type(y)
+    # revealed: Literal[2, 3]
+    # error: [possibly-unresolved-reference]
+    reveal_type(y)
 ```

 ## Basic match

 ```py
-y = 1
-y = 2
-match 0:
-    case 1:
-        y = 3
-    case 2:
-        y = 4
+def _(target: int):
+    y = 1
+    y = 2

-reveal_type(y)  # revealed: Literal[2, 3, 4]
+    match target:
+        case 1:
+            y = 3
+        case 2:
+            y = 4
+
+    reveal_type(y)  # revealed: Literal[2, 3, 4]
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/declaration/error.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/declaration/error.md
@@ -10,42 +10,35 @@ x: str  # error: [invalid-declaration] "Cannot declare type `str` for inferred t
 ## Incompatible declarations

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    if flag:
+        x: str
+    else:
+        x: int

-flag = bool_instance()
-if flag:
-    x: str
-else:
-    x: int
-x = 1  # error: [conflicting-declarations] "Conflicting declared types for `x`: str, int"
+    x = 1  # error: [conflicting-declarations] "Conflicting declared types for `x`: str, int"
 ```

 ## Partial declarations

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    if flag:
+        x: int

-flag = bool_instance()
-if flag:
-    x: int
-x = 1  # error: [conflicting-declarations] "Conflicting declared types for `x`: Unknown, int"
+    x = 1  # error: [conflicting-declarations] "Conflicting declared types for `x`: Unknown, int"
 ```

 ## Incompatible declarations with bad assignment

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    if flag:
+        x: str
+    else:
+        x: int

-flag = bool_instance()
-if flag:
-    x: str
-else:
-    x: int
-
-# error: [conflicting-declarations]
-# error: [invalid-assignment]
-x = b"foo"
+    # error: [conflicting-declarations]
+    # error: [invalid-assignment]
+    x = b"foo"
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/exception/basic.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/exception/basic.md
@@ -49,12 +49,44 @@ def foo(
    try:
        help()
    except x as e:
-        # TODO: should be `AttributeError`
-        reveal_type(e)  # revealed: @Todo(exception type)
+        reveal_type(e)  # revealed: AttributeError
    except y as f:
-        # TODO: should be `OSError | RuntimeError`
-        reveal_type(f)  # revealed: @Todo(exception type)
+        reveal_type(f)  # revealed: OSError | RuntimeError
    except z as g:
        # TODO: should be `BaseException`
-        reveal_type(g)  # revealed: @Todo(exception type)
+        reveal_type(g)  # revealed: @Todo(full tuple[...] support)
+```
+
+## Invalid exception handlers
+
+```py
+try:
+    pass
+# error: [invalid-exception-caught] "Cannot catch object of type `Literal[3]` in an exception handler (must be a `BaseException` subclass or a tuple of `BaseException` subclasses)"
+except 3 as e:
+    reveal_type(e)  # revealed: Unknown
+
+try:
+    pass
+# error: [invalid-exception-caught] "Cannot catch object of type `Literal["foo"]` in an exception handler (must be a `BaseException` subclass or a tuple of `BaseException` subclasses)"
+# error: [invalid-exception-caught] "Cannot catch object of type `Literal[b"bar"]` in an exception handler (must be a `BaseException` subclass or a tuple of `BaseException` subclasses)"
+except (ValueError, OSError, "foo", b"bar") as e:
+    reveal_type(e)  # revealed: ValueError | OSError | Unknown
+
+def foo(
+    x: type[str],
+    y: tuple[type[OSError], type[RuntimeError], int],
+    z: tuple[type[str], ...],
+):
+    try:
+        help()
+    # error: [invalid-exception-caught]
+    except x as e:
+        reveal_type(e)  # revealed: Unknown
+    # error: [invalid-exception-caught]
+    except y as f:
+        reveal_type(f)  # revealed: OSError | RuntimeError | Unknown
+    except z as g:
+        # TODO: should emit a diagnostic here:
+        reveal_type(g)  # revealed: @Todo(full tuple[...] support)
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/exception/except_star.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/exception/except_star.md
@@ -1,30 +1,66 @@
-# Except star
+# `except*`

-## Except\* with BaseException
+`except*` is only available in Python 3.11 and later:
+
+```toml
+[environment]
+python-version = "3.11"
+```
+
+## `except*` with `BaseException`

 ```py
 try:
    help()
 except* BaseException as e:
+    # TODO: should be `BaseExceptionGroup[BaseException]` --Alex
    reveal_type(e)  # revealed: BaseExceptionGroup
 ```

-## Except\* with specific exception
+## `except*` with specific exception

 ```py
 try:
    help()
 except* OSError as e:
-    # TODO(Alex): more precise would be `ExceptionGroup[OSError]`
+    # TODO: more precise would be `ExceptionGroup[OSError]` --Alex
+    # (needs homogenous tuples + generics)
    reveal_type(e)  # revealed: BaseExceptionGroup
 ```

-## Except\* with multiple exceptions
+## `except*` with multiple exceptions

 ```py
 try:
    help()
 except* (TypeError, AttributeError) as e:
-    # TODO(Alex): more precise would be `ExceptionGroup[TypeError | AttributeError]`.
+    # TODO: more precise would be `ExceptionGroup[TypeError | AttributeError]` --Alex
+    # (needs homogenous tuples + generics)
+    reveal_type(e)  # revealed: BaseExceptionGroup
+```
+
+## `except*` with mix of `Exception`s and `BaseException`s
+
+```py
+try:
+    help()
+except* (KeyboardInterrupt, AttributeError) as e:
+    # TODO: more precise would be `BaseExceptionGroup[KeyboardInterrupt | AttributeError]` --Alex
+    reveal_type(e)  # revealed: BaseExceptionGroup
+```
+
+## Invalid `except*` handlers
+
+```py
+try:
+    help()
+except* 3 as e:  # error: [invalid-exception-caught]
+    # TODO: Should be `BaseExceptionGroup[Unknown]` --Alex
+    reveal_type(e)  # revealed: BaseExceptionGroup
+
+try:
+    help()
+except* (AttributeError, 42) as e:  # error: [invalid-exception-caught]
+    # TODO: Should be `BaseExceptionGroup[AttributeError | Unknown]` --Alex
    reveal_type(e)  # revealed: BaseExceptionGroup
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/exception/invalid_syntax.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/exception/invalid_syntax.md
@@ -9,5 +9,4 @@ try:
    print
 except as e:  # error: [invalid-syntax]
    reveal_type(e)  # revealed: Unknown
-
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/expression/attribute.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/expression/attribute.md
@@ -3,26 +3,25 @@
 ## Boundness

 ```py
-def flag() -> bool: ...
+def _(flag: bool):
+    class A:
+        always_bound = 1

-class A:
-    always_bound = 1
+        if flag:
+            union = 1
+        else:
+            union = "abc"

-    if flag():
-        union = 1
-    else:
-        union = "abc"
+        if flag:
+            possibly_unbound = "abc"

-    if flag():
-        possibly_unbound = "abc"
+    reveal_type(A.always_bound)  # revealed: Literal[1]

-reveal_type(A.always_bound)  # revealed: Literal[1]
+    reveal_type(A.union)  # revealed: Literal[1] | Literal["abc"]

-reveal_type(A.union)  # revealed: Literal[1] | Literal["abc"]
+    # error: [possibly-unbound-attribute] "Attribute `possibly_unbound` on type `Literal[A]` is possibly unbound"
+    reveal_type(A.possibly_unbound)  # revealed: Literal["abc"]

-# error: [possibly-unbound-attribute] "Attribute `possibly_unbound` on type `Literal[A]` is possibly unbound"
-reveal_type(A.possibly_unbound)  # revealed: Literal["abc"]
-
-# error: [unresolved-attribute] "Type `Literal[A]` has no attribute `non_existent`"
-reveal_type(A.non_existent)  # revealed: Unknown
+    # error: [unresolved-attribute] "Type `Literal[A]` has no attribute `non_existent`"
+    reveal_type(A.non_existent)  # revealed: Unknown
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/expression/boolean.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/expression/boolean.md
@@ -3,54 +3,45 @@
 ## OR

 ```py
-def foo() -> str:
-    pass
-
-reveal_type(True or False)  # revealed: Literal[True]
-reveal_type("x" or "y" or "z")  # revealed: Literal["x"]
-reveal_type("" or "y" or "z")  # revealed: Literal["y"]
-reveal_type(False or "z")  # revealed: Literal["z"]
-reveal_type(False or True)  # revealed: Literal[True]
-reveal_type(False or False)  # revealed: Literal[False]
-reveal_type(foo() or False)  # revealed: str | Literal[False]
-reveal_type(foo() or True)  # revealed: str | Literal[True]
+def _(foo: str):
+    reveal_type(True or False)  # revealed: Literal[True]
+    reveal_type("x" or "y" or "z")  # revealed: Literal["x"]
+    reveal_type("" or "y" or "z")  # revealed: Literal["y"]
+    reveal_type(False or "z")  # revealed: Literal["z"]
+    reveal_type(False or True)  # revealed: Literal[True]
+    reveal_type(False or False)  # revealed: Literal[False]
+    reveal_type(foo or False)  # revealed: str | Literal[False]
+    reveal_type(foo or True)  # revealed: str | Literal[True]
 ```

 ## AND

 ```py
-def foo() -> str:
-    pass
-
-reveal_type(True and False)  # revealed: Literal[False]
-reveal_type(False and True)  # revealed: Literal[False]
-reveal_type(foo() and False)  # revealed: str | Literal[False]
-reveal_type(foo() and True)  # revealed: str | Literal[True]
-reveal_type("x" and "y" and "z")  # revealed: Literal["z"]
-reveal_type("x" and "y" and "")  # revealed: Literal[""]
-reveal_type("" and "y")  # revealed: Literal[""]
+def _(foo: str):
+    reveal_type(True and False)  # revealed: Literal[False]
+    reveal_type(False and True)  # revealed: Literal[False]
+    reveal_type(foo and False)  # revealed: str | Literal[False]
+    reveal_type(foo and True)  # revealed: str | Literal[True]
+    reveal_type("x" and "y" and "z")  # revealed: Literal["z"]
+    reveal_type("x" and "y" and "")  # revealed: Literal[""]
+    reveal_type("" and "y")  # revealed: Literal[""]
 ```

 ## Simple function calls to bool

 ```py
-def returns_bool() -> bool:
-    return True
+def _(flag: bool):
+    if flag:
+        x = True
+    else:
+        x = False

-if returns_bool():
-    x = True
-else:
-    x = False
-
-reveal_type(x)  # revealed: bool
+    reveal_type(x)  # revealed: bool
 ```

 ## Complex

 ```py
-def foo() -> str:
-    pass
-
 reveal_type("x" and "y" or "z")  # revealed: Literal["y"]
 reveal_type("x" or "y" and "z")  # revealed: Literal["x"]
 reveal_type("" and "y" or "z")  # revealed: Literal["z"]
--- a/crates/red_knot_python_semantic/resources/mdtest/expression/if.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/expression/if.md
@@ -3,10 +3,8 @@
 ## Union

 ```py
-def bool_instance() -> bool:
-    return True
-
-reveal_type(1 if bool_instance() else 2)  # revealed: Literal[1, 2]
+def _(flag: bool):
+    reveal_type(1 if flag else 2)  # revealed: Literal[1, 2]
 ```

 ## Statically known branches
@@ -30,14 +28,12 @@ reveal_type(1 if 0 else 2)  # revealed: Literal[2]
 The test inside an if expression should not affect code outside of the expression.

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x: Literal[42, "hello"] = 42 if flag else "hello"

-x: Literal[42, "hello"] = 42 if bool_instance() else "hello"
+    reveal_type(x)  # revealed: Literal[42] | Literal["hello"]

-reveal_type(x)  # revealed: Literal[42] | Literal["hello"]
+    _ = ... if isinstance(x, str) else ...

-_ = ... if isinstance(x, str) else ...
-
-reveal_type(x)  # revealed: Literal[42] | Literal["hello"]
+    reveal_type(x)  # revealed: Literal[42] | Literal["hello"]
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/expression/len.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/expression/len.md
@@ -0,0 +1,218 @@
+# Length (`len()`)
+
+## Literal and constructed iterables
+
+### Strings and bytes literals
+
+```py
+reveal_type(len("no\rmal"))  # revealed: Literal[6]
+reveal_type(len(r"aw stri\ng"))  # revealed: Literal[10]
+reveal_type(len(r"conca\t" "ena\tion"))  # revealed: Literal[14]
+reveal_type(len(b"ytes lite" rb"al"))  # revealed: Literal[11]
+reveal_type(len("𝒰𝕹🄸©🕲𝕕ℇ"))  # revealed: Literal[7]
+
+reveal_type(  # revealed: Literal[7]
+    len(
+        """foo
+bar"""
+    )
+)
+reveal_type(  # revealed: Literal[9]
+    len(
+        r"""foo\r
+bar"""
+    )
+)
+reveal_type(  # revealed: Literal[7]
+    len(
+        b"""foo
+bar"""
+    )
+)
+reveal_type(  # revealed: Literal[9]
+    len(
+        rb"""foo\r
+bar"""
+    )
+)
+```
+
+### Tuples
+
+```py
+reveal_type(len(()))  # revealed: Literal[0]
+reveal_type(len((1,)))  # revealed: Literal[1]
+reveal_type(len((1, 2)))  # revealed: Literal[2]
+
+# TODO: Handle constructor calls
+reveal_type(len(tuple()))  # revealed: int
+
+# TODO: Handle star unpacks; Should be: Literal[0]
+reveal_type(len((*[],)))  # revealed: Literal[1]
+
+# TODO: Handle star unpacks; Should be: Literal[1]
+reveal_type(  # revealed: Literal[2]
+    len(
+        (
+            *[],
+            1,
+        )
+    )
+)
+
+# TODO: Handle star unpacks; Should be: Literal[2]
+reveal_type(len((*[], 1, 2)))  # revealed: Literal[3]
+
+# TODO: Handle star unpacks; Should be: Literal[0]
+reveal_type(len((*[], *{})))  # revealed: Literal[2]
+```
+
+### Lists, sets and dictionaries
+
+```py
+reveal_type(len([]))  # revealed: int
+reveal_type(len([1]))  # revealed: int
+reveal_type(len([1, 2]))  # revealed: int
+reveal_type(len([*{}, *dict()]))  # revealed: int
+
+reveal_type(len({}))  # revealed: int
+reveal_type(len({**{}}))  # revealed: int
+reveal_type(len({**{}, **{}}))  # revealed: int
+
+reveal_type(len({1}))  # revealed: int
+reveal_type(len({1, 2}))  # revealed: int
+reveal_type(len({*[], 2}))  # revealed: int
+
+reveal_type(len(list()))  # revealed: int
+reveal_type(len(set()))  # revealed: int
+reveal_type(len(dict()))  # revealed: int
+reveal_type(len(frozenset()))  # revealed: int
+```
+
+## `__len__`
+
+The returned value of `__len__` is implicitly and recursively converted to `int`.
+
+### Literal integers
+
+```py
+from typing import Literal
+
+class Zero:
+    def __len__(self) -> Literal[0]: ...
+
+class ZeroOrOne:
+    def __len__(self) -> Literal[0, 1]: ...
+
+class ZeroOrTrue:
+    def __len__(self) -> Literal[0, True]: ...
+
+class OneOrFalse:
+    def __len__(self) -> Literal[1] | Literal[False]: ...
+
+class OneOrFoo:
+    def __len__(self) -> Literal[1, "foo"]: ...
+
+class ZeroOrStr:
+    def __len__(self) -> Literal[0] | str: ...
+
+reveal_type(len(Zero()))  # revealed: Literal[0]
+reveal_type(len(ZeroOrOne()))  # revealed: Literal[0, 1]
+reveal_type(len(ZeroOrTrue()))  # revealed: Literal[0, 1]
+reveal_type(len(OneOrFalse()))  # revealed: Literal[0, 1]
+
+# TODO: Emit a diagnostic
+reveal_type(len(OneOrFoo()))  # revealed: int
+
+# TODO: Emit a diagnostic
+reveal_type(len(ZeroOrStr()))  # revealed: int
+```
+
+### Literal booleans
+
+```py
+from typing import Literal
+
+class LiteralTrue:
+    def __len__(self) -> Literal[True]: ...
+
+class LiteralFalse:
+    def __len__(self) -> Literal[False]: ...
+
+reveal_type(len(LiteralTrue()))  # revealed: Literal[1]
+reveal_type(len(LiteralFalse()))  # revealed: Literal[0]
+```
+
+### Enums
+
+```py
+from enum import Enum, auto
+from typing import Literal
+
+class SomeEnum(Enum):
+    AUTO = auto()
+    INT = 2
+    STR = "4"
+    TUPLE = (8, "16")
+    INT_2 = 3_2
+
+class Auto:
+    def __len__(self) -> Literal[SomeEnum.AUTO]: ...
+
+class Int:
+    def __len__(self) -> Literal[SomeEnum.INT]: ...
+
+class Str:
+    def __len__(self) -> Literal[SomeEnum.STR]: ...
+
+class Tuple:
+    def __len__(self) -> Literal[SomeEnum.TUPLE]: ...
+
+class IntUnion:
+    def __len__(self) -> Literal[SomeEnum.INT, SomeEnum.INT_2]: ...
+
+reveal_type(len(Auto()))  # revealed: int
+reveal_type(len(Int()))  # revealed: Literal[2]
+reveal_type(len(Str()))  # revealed: int
+reveal_type(len(Tuple()))  # revealed: int
+reveal_type(len(IntUnion()))  # revealed: Literal[2, 32]
+```
+
+### Negative integers
+
+```py
+from typing import Literal
+
+class Negative:
+    def __len__(self) -> Literal[-1]: ...
+
+# TODO: Emit a diagnostic
+reveal_type(len(Negative()))  # revealed: int
+```
+
+### Wrong signature
+
+```py
+from typing import Literal
+
+class SecondOptionalArgument:
+    def __len__(self, v: int = 0) -> Literal[0]: ...
+
+class SecondRequiredArgument:
+    def __len__(self, v: int) -> Literal[1]: ...
+
+# TODO: Emit a diagnostic
+reveal_type(len(SecondOptionalArgument()))  # revealed: Literal[0]
+
+# TODO: Emit a diagnostic
+reveal_type(len(SecondRequiredArgument()))  # revealed: Literal[1]
+```
+
+### No `__len__`
+
+```py
+class NoDunderLen: ...
+
+# TODO: Emit a diagnostic
+reveal_type(len(NoDunderLen()))  # revealed: int
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/function/parameters.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/function/parameters.md
@@ -0,0 +1,75 @@
+# Function parameter types
+
+Within a function scope, the declared type of each parameter is its annotated type (or Unknown if
+not annotated). The initial inferred type is the union of the declared type with the type of the
+default value expression (if any). If both are fully static types, this union should simplify to the
+annotated type (since the default value type must be assignable to the annotated type, and for fully
+static types this means subtype-of, which simplifies in unions). But if the annotated type is
+Unknown or another non-fully-static type, the default value type may still be relevant as lower
+bound.
+
+The variadic parameter is a variadic tuple of its annotated type; the variadic-keywords parameter is
+a dictionary from strings to its annotated type.
+
+## Parameter kinds
+
+```py
+from typing import Literal
+
+def f(a, b: int, c=1, d: int = 2, /, e=3, f: Literal[4] = 4, *args: object, g=5, h: Literal[6] = 6, **kwargs: str):
+    reveal_type(a)  # revealed: Unknown
+    reveal_type(b)  # revealed: int
+    reveal_type(c)  # revealed: Unknown | Literal[1]
+    reveal_type(d)  # revealed: int
+    reveal_type(e)  # revealed: Unknown | Literal[3]
+    reveal_type(f)  # revealed: Literal[4]
+    reveal_type(g)  # revealed: Unknown | Literal[5]
+    reveal_type(h)  # revealed: Literal[6]
+
+    # TODO: should be `tuple[object, ...]` (needs generics)
+    reveal_type(args)  # revealed: tuple
+
+    # TODO: should be `dict[str, str]` (needs generics)
+    reveal_type(kwargs)  # revealed: dict
+```
+
+## Unannotated variadic parameters
+
+...are inferred as tuple of Unknown or dict from string to Unknown.
+
+```py
+def g(*args, **kwargs):
+    # TODO: should be `tuple[Unknown, ...]` (needs generics)
+    reveal_type(args)  # revealed: tuple
+
+    # TODO: should be `dict[str, Unknown]` (needs generics)
+    reveal_type(kwargs)  # revealed: dict
+```
+
+## Annotation is present but not a fully static type
+
+The default value type should be a lower bound on the inferred type.
+
+```py
+from typing import Any
+
+def f(x: Any = 1):
+    reveal_type(x)  # revealed: Any | Literal[1]
+```
+
+## Default value type must be assignable to annotated type
+
+The default value type must be assignable to the annotated type. If not, we emit a diagnostic, and
+fall back to inferring the annotated type, ignoring the default value type.
+
+```py
+# error: [invalid-parameter-default]
+def f(x: int = "foo"):
+    reveal_type(x)  # revealed: int
+
+# The check is assignable-to, not subtype-of, so this is fine:
+from typing import Any
+
+def g(x: Any = "foo"):
+    reveal_type(x)  # revealed: Any | Literal["foo"]
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/generics.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/generics.md
@@ -73,7 +73,7 @@ def f[T]():
 A typevar with less than two constraints emits a diagnostic:

 ```py
-# error: [invalid-typevar-constraints] "TypeVar must have at least two constrained types"
+# error: [invalid-type-variable-constraints] "TypeVar must have at least two constrained types"
 def f[T: (int,)]():
    pass
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/import/conditional.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/import/conditional.md
@@ -3,11 +3,10 @@
 ## Maybe unbound

 ```py path=maybe_unbound.py
-def bool_instance() -> bool:
+def coinflip() -> bool:
    return True

-flag = bool_instance()
-if flag:
+if coinflip():
    y = 3

 x = y  # error: [possibly-unresolved-reference]
@@ -31,13 +30,12 @@ reveal_type(y)  # revealed: Literal[3]
 ## Maybe unbound annotated

 ```py path=maybe_unbound_annotated.py
-def bool_instance() -> bool:
+def coinflip() -> bool:
    return True

-flag = bool_instance()
-
-if flag:
+if coinflip():
    y: int = 3
+
 x = y  # error: [possibly-unresolved-reference]

 # revealed: Literal[3]
@@ -63,10 +61,10 @@ reveal_type(y)  # revealed: int
 Importing a possibly undeclared name still gives us its declared type:

 ```py path=maybe_undeclared.py
-def bool_instance() -> bool:
+def coinflip() -> bool:
    return True

-if bool_instance():
+if coinflip():
    x: int
 ```

@@ -83,14 +81,12 @@ def f(): ...
 ```

 ```py path=b.py
-def bool_instance() -> bool:
+def coinflip() -> bool:
    return True

-flag = bool_instance()
-if flag:
+if coinflip():
    from c import f
 else:
-
    def f(): ...
 ```

@@ -111,11 +107,10 @@ x: int
 ```

 ```py path=b.py
-def bool_instance() -> bool:
+def coinflip() -> bool:
    return True

-flag = bool_instance()
-if flag:
+if coinflip():
    from c import x
 else:
    x = 1
--- a/crates/red_knot_python_semantic/resources/mdtest/import/errors.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/import/errors.md
@@ -55,3 +55,24 @@ from b import x

 x = "foo"  # error: [invalid-assignment] "Object of type `Literal["foo"]"
 ```
+
+## Import cycle
+
+```py path=a.py
+class A: ...
+
+reveal_type(A.__mro__)  # revealed: tuple[Literal[A], Literal[object]]
+import b
+
+class C(b.B): ...
+
+reveal_type(C.__mro__)  # revealed: tuple[Literal[C], Literal[B], Literal[A], Literal[object]]
+```
+
+```py path=b.py
+from a import A
+
+class B(A): ...
+
+reveal_type(B.__mro__)  # revealed: tuple[Literal[B], Literal[A], Literal[object]]
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/import/invalid_syntax.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/import/invalid_syntax.md
@@ -0,0 +1,9 @@
+# Invalid syntax
+
+## Missing module name
+
+```py
+from import bar  # error: [invalid-syntax]
+
+reveal_type(bar)  # revealed: Unknown
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/invalid_syntax.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/invalid_syntax.md
@@ -0,0 +1,93 @@
+# Syntax errors
+
+Test cases to ensure that red knot does not panic if there are syntax errors in the source code.
+
+The parser cannot recover from certain syntax errors completely which is why the number of syntax
+errors could be more than expected in the following examples. For instance, if there's a keyword
+(like `for`) in the middle of another statement (like function definition), then it's more likely
+that the rest of the tokens are going to be part of the `for` statement and not the function
+definition. But, it's not necessary that the remaining tokens are valid in the context of a `for`
+statement.
+
+## Keyword as identifiers
+
+When keywords are used as identifiers, the parser recovers from this syntax error by emitting an
+error and including the text value of the keyword to create the `Identifier` node.
+
+### Name expression
+
+#### Assignment
+
+```py
+# error: [invalid-syntax]
+pass = 1
+```
+
+#### Type alias
+
+```py
+# error: [invalid-syntax]
+# error: [invalid-syntax]
+type pass = 1
+```
+
+#### Function definition
+
+```py
+# error: [invalid-syntax]
+# error: [invalid-syntax]
+# error: [invalid-syntax]
+# error: [invalid-syntax]
+# error: [invalid-syntax]
+def True(for):
+    # error: [invalid-syntax]
+    # error: [invalid-syntax]
+    pass
+```
+
+#### For
+
+```py
+# error: [invalid-syntax]
+# error: [invalid-syntax]
+# error: [unresolved-reference] "Name `pass` used when not defined"
+for while in pass:
+    pass
+```
+
+#### While
+
+```py
+# error: [invalid-syntax]
+# error: [unresolved-reference] "Name `in` used when not defined"
+while in:
+    pass
+```
+
+#### Match
+
+```py
+# error: [invalid-syntax]
+# error: [invalid-syntax]
+# error: [unresolved-reference] "Name `match` used when not defined"
+match while:
+    # error: [invalid-syntax]
+    # error: [invalid-syntax]
+    # error: [invalid-syntax]
+    # error: [unresolved-reference] "Name `case` used when not defined"
+    case in:
+        # error: [invalid-syntax]
+        # error: [invalid-syntax]
+        pass
+```
+
+### Attribute expression
+
+```py
+# TODO: Check when support for attribute expressions is added
+
+# error: [invalid-syntax]
+# error: [unresolved-reference] "Name `foo` used when not defined"
+for x in foo.pass:
+    pass
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/known_constants.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/known_constants.md
@@ -0,0 +1,52 @@
+# Known constants
+
+## `typing.TYPE_CHECKING`
+
+This constant is `True` when in type-checking mode, `False` otherwise. The symbol is defined to be
+`False` at runtime. In typeshed, it is annotated as `bool`. This test makes sure that we infer
+`Literal[True]` for it anyways.
+
+### Basic
+
+```py
+from typing import TYPE_CHECKING
+import typing
+
+reveal_type(TYPE_CHECKING)  # revealed: Literal[True]
+reveal_type(typing.TYPE_CHECKING)  # revealed: Literal[True]
+```
+
+### Aliased
+
+Make sure that we still infer the correct type if the constant has been given a different name:
+
+```py
+from typing import TYPE_CHECKING as TC
+
+reveal_type(TC)  # revealed: Literal[True]
+```
+
+### Must originate from `typing`
+
+Make sure we only use our special handling for `typing.TYPE_CHECKING` and not for other constants
+with the same name:
+
+```py path=constants.py
+TYPE_CHECKING: bool = False
+```
+
+```py
+from constants import TYPE_CHECKING
+
+reveal_type(TYPE_CHECKING)  # revealed: bool
+```
+
+### `typing_extensions` re-export
+
+This should behave in the same way as `typing.TYPE_CHECKING`:
+
+```py
+from typing_extensions import TYPE_CHECKING
+
+reveal_type(TYPE_CHECKING)  # revealed: Literal[True]
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/literal/ellipsis.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/literal/ellipsis.md
@@ -0,0 +1,7 @@
+# Ellipsis literals
+
+## Simple
+
+```py
+reveal_type(...)  # revealed: EllipsisType | ellipsis
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/loops/for.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/loops/for.md
@@ -106,23 +106,19 @@ reveal_type(x)
 ## With non-callable iterator

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    class NotIterable:
+        if flag:
+            __iter__ = 1
+        else:
+            __iter__ = None

-flag = bool_instance()
+    for x in NotIterable():  # error: "Object of type `NotIterable` is not iterable"
+        pass

-class NotIterable:
-    if flag:
-        __iter__ = 1
-    else:
-        __iter__ = None
-
-for x in NotIterable():  # error: "Object of type `NotIterable` is not iterable"
-    pass
-
-# revealed: Unknown
-# error: [possibly-unresolved-reference]
-reveal_type(x)
+    # revealed: Unknown
+    # error: [possibly-unresolved-reference]
+    reveal_type(x)
 ```

 ## Invalid iterable
@@ -160,13 +156,9 @@ class Test2:
    def __iter__(self) -> TestIter:
        return TestIter()

-def bool_instance() -> bool:
-    return True
-
-flag = bool_instance()
-
-for x in Test() if flag else Test2():
-    reveal_type(x)  # revealed: int
+def _(flag: bool):
+    for x in Test() if flag else Test2():
+        reveal_type(x)  # revealed: int
 ```

 ## Union type as iterator
@@ -215,13 +207,9 @@ class Test2:
    def __iter__(self) -> TestIter3 | TestIter4:
        return TestIter3()

-def bool_instance() -> bool:
-    return True
-
-flag = bool_instance()
-
-for x in Test() if flag else Test2():
-    reveal_type(x)  # revealed: int | Exception | str | tuple[int, int] | bytes | memoryview
+def _(flag: bool):
+    for x in Test() if flag else Test2():
+        reveal_type(x)  # revealed: int | Exception | str | tuple[int, int] | bytes | memoryview
 ```

 ## Union type as iterable where one union element has no `__iter__` method
@@ -235,12 +223,10 @@ class Test:
    def __iter__(self) -> TestIter:
        return TestIter()

-def coinflip() -> bool:
-    return True
-
-# error: [not-iterable] "Object of type `Test | Literal[42]` is not iterable because its `__iter__` method is possibly unbound"
-for x in Test() if coinflip() else 42:
-    reveal_type(x)  # revealed: int
+def _(flag: bool):
+    # error: [not-iterable] "Object of type `Test | Literal[42]` is not iterable because its `__iter__` method is possibly unbound"
+    for x in Test() if flag else 42:
+        reveal_type(x)  # revealed: int
 ```

 ## Union type as iterable where one union element has invalid `__iter__` method
@@ -258,12 +244,10 @@ class Test2:
    def __iter__(self) -> int:
        return 42

-def coinflip() -> bool:
-    return True
-
-# error: "Object of type `Test | Test2` is not iterable"
-for x in Test() if coinflip() else Test2():
-    reveal_type(x)  # revealed: Unknown
+def _(flag: bool):
+    # error: "Object of type `Test | Test2` is not iterable"
+    for x in Test() if flag else Test2():
+        reveal_type(x)  # revealed: Unknown
 ```

 ## Union type as iterator where one union element has no `__next__` method
--- a/crates/red_knot_python_semantic/resources/mdtest/loops/while_loop.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/loops/while_loop.md
@@ -1,59 +1,50 @@
 # While loops

-## Basic While Loop
+## Basic `while` loop

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = 1
+    while flag:
+        x = 2

-flag = bool_instance()
-x = 1
-while flag:
-    x = 2
-
-reveal_type(x)  # revealed: Literal[1, 2]
-```
-
-## While with else (no break)
-
-```py
-def bool_instance() -> bool:
-    return True
-
-flag = bool_instance()
-x = 1
-while flag:
-    x = 2
-else:
    reveal_type(x)  # revealed: Literal[1, 2]
-    x = 3
-
-reveal_type(x)  # revealed: Literal[3]
 ```

-## While with Else (may break)
+## `while` with `else` (no `break`)

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = 1
+    while flag:
+        x = 2
+    else:
+        reveal_type(x)  # revealed: Literal[1, 2]
+        x = 3

-flag, flag2 = bool_instance(), bool_instance()
-x = 1
-y = 0
-while flag:
-    x = 2
-    if flag2:
-        y = 4
-        break
-else:
-    y = x
-    x = 3
-
-reveal_type(x)  # revealed: Literal[2, 3]
-reveal_type(y)  # revealed: Literal[1, 2, 4]
+    reveal_type(x)  # revealed: Literal[3]
 ```

-## Nested while loops
+## `while` with `else` (may `break`)
+
+```py
+def _(flag: bool, flag2: bool):
+    x = 1
+    y = 0
+    while flag:
+        x = 2
+        if flag2:
+            y = 4
+            break
+    else:
+        y = x
+        x = 3
+
+    reveal_type(x)  # revealed: Literal[2, 3]
+    reveal_type(y)  # revealed: Literal[1, 2, 4]
+```
+
+## Nested `while` loops

 ```py
 def flag() -> bool:
@@ -78,3 +69,50 @@ else:

 reveal_type(x)  # revealed: Literal[3, 4, 5]
 ```
+
+## Boundness
+
+Make sure that the boundness information is correctly tracked in `while` loop control flow.
+
+### Basic `while` loop
+
+```py
+def _(flag: bool):
+    while flag:
+        x = 1
+
+    # error: [possibly-unresolved-reference]
+    x
+```
+
+### `while` with `else` (no `break`)
+
+```py
+def _(flag: bool):
+    while flag:
+        y = 1
+    else:
+        x = 1
+
+    # no error, `x` is always bound
+    x
+    # error: [possibly-unresolved-reference]
+    y
+```
+
+### `while` with `else` (may `break`)
+
+```py
+def _(flag: bool, flag2: bool):
+    while flag:
+        x = 1
+        if flag2:
+            break
+    else:
+        y = 1
+
+    # error: [possibly-unresolved-reference]
+    x
+    # error: [possibly-unresolved-reference]
+    y
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/mdtest_config.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/mdtest_config.md
@@ -0,0 +1,67 @@
+This test makes sure that `red_knot_test` correctly parses the TOML configuration blocks and applies
+the correct settings hierarchically.
+
+The following configuration will be attached to the *root* section (without any heading):
+
+```toml
+[environment]
+python-version = "3.10"
+```
+
+# Basic
+
+Here, we simply make sure that we pick up the global configuration from the root section:
+
+```py
+reveal_type(sys.version_info[:2] == (3, 10))  # revealed: Literal[True]
+```
+
+# Inheritance
+
+## Child
+
+### Grandchild
+
+The same should work for arbitrarily nested sections:
+
+```py
+reveal_type(sys.version_info[:2] == (3, 10))  # revealed: Literal[True]
+```
+
+# Overwriting
+
+Here, we make sure that we can overwrite the global configuration in a child section:
+
+```toml
+[environment]
+python-version = "3.11"
+```
+
+```py
+reveal_type(sys.version_info[:2] == (3, 11))  # revealed: Literal[True]
+```
+
+# No global state
+
+There is no global state. This section should again use the root configuration:
+
+```py
+reveal_type(sys.version_info[:2] == (3, 10))  # revealed: Literal[True]
+```
+
+# Overwriting affects children
+
+Children in this section should all use the section configuration:
+
+```toml
+[environment]
+python-version = "3.12"
+```
+
+## Child
+
+### Grandchild
+
+```py
+reveal_type(sys.version_info[:2] == (3, 12))  # revealed: Literal[True]
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/metaclass.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/metaclass.md
@@ -179,9 +179,9 @@ reveal_type(A.__class__)  # revealed: @Todo(metaclass not a class)
 Retrieving the metaclass of a cyclically defined class should not cause an infinite loop.

 ```py path=a.pyi
-class A(B): ...  # error: [cyclic-class-def]
-class B(C): ...  # error: [cyclic-class-def]
-class C(A): ...  # error: [cyclic-class-def]
+class A(B): ...  # error: [cyclic-class-definition]
+class B(C): ...  # error: [cyclic-class-definition]
+class C(A): ...  # error: [cyclic-class-definition]

 reveal_type(A.__class__)  # revealed: Unknown
 ```
@@ -194,3 +194,26 @@ class A[T: str](metaclass=M): ...

 reveal_type(A.__class__)  # revealed: Literal[M]
 ```
+
+## Metaclasses of metaclasses
+
+```py
+class Foo(type): ...
+class Bar(type, metaclass=Foo): ...
+class Baz(type, metaclass=Bar): ...
+class Spam(metaclass=Baz): ...
+
+reveal_type(Spam.__class__)  # revealed: Literal[Baz]
+reveal_type(Spam.__class__.__class__)  # revealed: Literal[Bar]
+reveal_type(Spam.__class__.__class__.__class__)  # revealed: Literal[Foo]
+
+def test(x: Spam):
+    reveal_type(x.__class__)  # revealed: type[Spam]
+    reveal_type(x.__class__.__class__)  # revealed: type[Baz]
+    reveal_type(x.__class__.__class__.__class__)  # revealed: type[Bar]
+    reveal_type(x.__class__.__class__.__class__.__class__)  # revealed: type[Foo]
+    reveal_type(x.__class__.__class__.__class__.__class__.__class__)  # revealed: type[type]
+
+    # revealed: type[type]
+    reveal_type(x.__class__.__class__.__class__.__class__.__class__.__class__.__class__.__class__)
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/mro.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/mro.md
@@ -348,14 +348,14 @@ reveal_type(unknown_object.__mro__)  # revealed: Unknown
 These are invalid, but we need to be able to handle them gracefully without panicking.

 ```py path=a.pyi
-class Foo(Foo): ...  # error: [cyclic-class-def]
+class Foo(Foo): ...  # error: [cyclic-class-definition]

 reveal_type(Foo)  # revealed: Literal[Foo]
 reveal_type(Foo.__mro__)  # revealed: tuple[Literal[Foo], Unknown, Literal[object]]

 class Bar: ...
 class Baz: ...
-class Boz(Bar, Baz, Boz): ...  # error: [cyclic-class-def]
+class Boz(Bar, Baz, Boz): ...  # error: [cyclic-class-definition]

 reveal_type(Boz)  # revealed: Literal[Boz]
 reveal_type(Boz.__mro__)  # revealed: tuple[Literal[Boz], Unknown, Literal[object]]
@@ -366,9 +366,9 @@ reveal_type(Boz.__mro__)  # revealed: tuple[Literal[Boz], Unknown, Literal[objec
 These are similarly unlikely, but we still shouldn't crash:

 ```py path=a.pyi
-class Foo(Bar): ...  # error: [cyclic-class-def]
-class Bar(Baz): ...  # error: [cyclic-class-def]
-class Baz(Foo): ...  # error: [cyclic-class-def]
+class Foo(Bar): ...  # error: [cyclic-class-definition]
+class Bar(Baz): ...  # error: [cyclic-class-definition]
+class Baz(Foo): ...  # error: [cyclic-class-definition]

 reveal_type(Foo.__mro__)  # revealed: tuple[Literal[Foo], Unknown, Literal[object]]
 reveal_type(Bar.__mro__)  # revealed: tuple[Literal[Bar], Unknown, Literal[object]]
@@ -379,9 +379,9 @@ reveal_type(Baz.__mro__)  # revealed: tuple[Literal[Baz], Unknown, Literal[objec

 ```py path=a.pyi
 class Spam: ...
-class Foo(Bar): ...  # error: [cyclic-class-def]
-class Bar(Baz): ...  # error: [cyclic-class-def]
-class Baz(Foo, Spam): ...  # error: [cyclic-class-def]
+class Foo(Bar): ...  # error: [cyclic-class-definition]
+class Bar(Baz): ...  # error: [cyclic-class-definition]
+class Baz(Foo, Spam): ...  # error: [cyclic-class-definition]

 reveal_type(Foo.__mro__)  # revealed: tuple[Literal[Foo], Unknown, Literal[object]]
 reveal_type(Bar.__mro__)  # revealed: tuple[Literal[Bar], Unknown, Literal[object]]
@@ -391,16 +391,16 @@ reveal_type(Baz.__mro__)  # revealed: tuple[Literal[Baz], Unknown, Literal[objec
 ## Classes with cycles in their MRO, and a sub-graph

 ```py path=a.pyi
-class FooCycle(BarCycle): ...  # error: [cyclic-class-def]
+class FooCycle(BarCycle): ...  # error: [cyclic-class-definition]
 class Foo: ...
-class BarCycle(FooCycle): ...  # error: [cyclic-class-def]
+class BarCycle(FooCycle): ...  # error: [cyclic-class-definition]
 class Bar(Foo): ...

 # TODO: can we avoid emitting the errors for these?
 # The classes have cyclic superclasses,
 # but are not themselves cyclic...
-class Baz(Bar, BarCycle): ...  # error: [cyclic-class-def]
-class Spam(Baz): ...  # error: [cyclic-class-def]
+class Baz(Bar, BarCycle): ...  # error: [cyclic-class-definition]
+class Spam(Baz): ...  # error: [cyclic-class-definition]

 reveal_type(FooCycle.__mro__)  # revealed: tuple[Literal[FooCycle], Unknown, Literal[object]]
 reveal_type(BarCycle.__mro__)  # revealed: tuple[Literal[BarCycle], Unknown, Literal[object]]
--- a/crates/red_knot_python_semantic/resources/mdtest/narrow/bool-call.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/narrow/bool-call.md
@@ -0,0 +1,32 @@
+## Narrowing for `bool(..)` checks
+
+```py
+def _(flag: bool):
+
+    x = 1 if flag else None
+
+    # valid invocation, positive
+    reveal_type(x)  # revealed: Literal[1] | None
+    if bool(x is not None):
+        reveal_type(x)  # revealed: Literal[1]
+
+    # valid invocation, negative
+    reveal_type(x)  # revealed: Literal[1] | None
+    if not bool(x is not None):
+        reveal_type(x)  # revealed: None
+
+    # no args/narrowing
+    reveal_type(x)  # revealed: Literal[1] | None
+    if not bool():
+        reveal_type(x)  # revealed: Literal[1] | None
+
+    # invalid invocation, too many positional args
+    reveal_type(x)  # revealed: Literal[1] | None
+    if bool(x is not None, 5):  # TODO diagnostic
+        reveal_type(x)  # revealed: Literal[1] | None
+
+    # invalid invocation, too many kwargs
+    reveal_type(x)  # revealed: Literal[1] | None
+    if bool(x is not None, y=5):  # TODO diagnostic
+        reveal_type(x)  # revealed: Literal[1] | None
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/narrow/boolean.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/narrow/boolean.md
@@ -9,85 +9,67 @@ Similarly, in `and` expressions, the right-hand side is evaluated only if the le
 ## Narrowing in `or`

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    class A: ...
+    x: A | None = A() if flag else None

-class A: ...
-
-x: A | None = A() if bool_instance() else None
-
-isinstance(x, A) or reveal_type(x)  # revealed: None
-x is None or reveal_type(x)  # revealed: A
-reveal_type(x)  # revealed: A | None
+    isinstance(x, A) or reveal_type(x)  # revealed: None
+    x is None or reveal_type(x)  # revealed: A
+    reveal_type(x)  # revealed: A | None
 ```

 ## Narrowing in `and`

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    class A: ...
+    x: A | None = A() if flag else None

-class A: ...
-
-x: A | None = A() if bool_instance() else None
-
-isinstance(x, A) and reveal_type(x)  # revealed: A
-x is None and reveal_type(x)  # revealed: None
-reveal_type(x)  # revealed: A | None
+    isinstance(x, A) and reveal_type(x)  # revealed: A
+    x is None and reveal_type(x)  # revealed: None
+    reveal_type(x)  # revealed: A | None
 ```

 ## Multiple `and` arms

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag1: bool, flag2: bool, flag3: bool, flag4: bool):
+    class A: ...
+    x: A | None = A() if flag1 else None

-class A: ...
-
-x: A | None = A() if bool_instance() else None
-
-bool_instance() and isinstance(x, A) and reveal_type(x)  # revealed: A
-isinstance(x, A) and bool_instance() and reveal_type(x)  # revealed: A
-reveal_type(x) and isinstance(x, A) and bool_instance()  # revealed: A | None
+    flag2 and isinstance(x, A) and reveal_type(x)  # revealed: A
+    isinstance(x, A) and flag2 and reveal_type(x)  # revealed: A
+    reveal_type(x) and isinstance(x, A) and flag3  # revealed: A | None
 ```

 ## Multiple `or` arms

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag1: bool, flag2: bool, flag3: bool, flag4: bool):
+    class A: ...
+    x: A | None = A() if flag1 else None

-class A: ...
-
-x: A | None = A() if bool_instance() else None
-
-bool_instance() or isinstance(x, A) or reveal_type(x)  # revealed: None
-isinstance(x, A) or bool_instance() or reveal_type(x)  # revealed: None
-reveal_type(x) or isinstance(x, A) or bool_instance()  # revealed: A | None
+    flag2 or isinstance(x, A) or reveal_type(x)  # revealed: None
+    isinstance(x, A) or flag3 or reveal_type(x)  # revealed: None
+    reveal_type(x) or isinstance(x, A) or flag4  # revealed: A | None
 ```

 ## Multiple predicates

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag1: bool, flag2: bool):
+    class A: ...
+    x: A | None | Literal[1] = A() if flag1 else None if flag2 else 1

-class A: ...
-
-x: A | None | Literal[1] = A() if bool_instance() else None if bool_instance() else 1
-
-x is None or isinstance(x, A) or reveal_type(x)  # revealed: Literal[1]
+    x is None or isinstance(x, A) or reveal_type(x)  # revealed: Literal[1]
 ```

 ## Mix of `and` and `or`

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag1: bool, flag2: bool):
+    class A: ...
+    x: A | None | Literal[1] = A() if flag1 else None if flag2 else 1

-class A: ...
-
-x: A | None | Literal[1] = A() if bool_instance() else None if bool_instance() else 1
-
-isinstance(x, A) or x is not None and reveal_type(x)  # revealed: Literal[1]
+    isinstance(x, A) or x is not None and reveal_type(x)  # revealed: Literal[1]
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/narrow/conditionals/boolean.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/narrow/conditionals/boolean.md
@@ -6,15 +6,11 @@
 class A: ...
 class B: ...

-def instance() -> A | B:
-    return A()
-
-x = instance()
-
-if isinstance(x, A) and isinstance(x, B):
-    reveal_type(x)  # revealed:  A & B
-else:
-    reveal_type(x)  # revealed:  B & ~A | A & ~B
+def _(x: A | B):
+    if isinstance(x, A) and isinstance(x, B):
+        reveal_type(x)  # revealed:  A & B
+    else:
+        reveal_type(x)  # revealed:  B & ~A | A & ~B
 ```

 ## Arms might not add narrowing constraints
@@ -23,25 +19,18 @@ else:
 class A: ...
 class B: ...

-def bool_instance() -> bool:
-    return True
+def _(flag: bool, x: A | B):
+    if isinstance(x, A) and flag:
+        reveal_type(x)  # revealed: A
+    else:
+        reveal_type(x)  # revealed: A | B

-def instance() -> A | B:
-    return A()
+    if flag and isinstance(x, A):
+        reveal_type(x)  # revealed: A
+    else:
+        reveal_type(x)  # revealed: A | B

-x = instance()
-
-if isinstance(x, A) and bool_instance():
-    reveal_type(x)  # revealed: A
-else:
    reveal_type(x)  # revealed: A | B
-
-if bool_instance() and isinstance(x, A):
-    reveal_type(x)  # revealed: A
-else:
-    reveal_type(x)  # revealed: A | B
-
-reveal_type(x)  # revealed: A | B
 ```

 ## Statically known arms
@@ -50,39 +39,35 @@ reveal_type(x)  # revealed: A | B
 class A: ...
 class B: ...

-def instance() -> A | B:
-    return A()
+def _(x: A | B):
+    if isinstance(x, A) and True:
+        reveal_type(x)  # revealed: A
+    else:
+        reveal_type(x)  # revealed: B & ~A

-x = instance()
+    if True and isinstance(x, A):
+        reveal_type(x)  # revealed: A
+    else:
+        reveal_type(x)  # revealed: B & ~A

-if isinstance(x, A) and True:
-    reveal_type(x)  # revealed: A
-else:
-    reveal_type(x)  # revealed: B & ~A
+    if False and isinstance(x, A):
+        # TODO: should emit an `unreachable code` diagnostic
+        reveal_type(x)  # revealed: A
+    else:
+        reveal_type(x)  # revealed: A | B

-if True and isinstance(x, A):
-    reveal_type(x)  # revealed: A
-else:
-    reveal_type(x)  # revealed: B & ~A
+    if False or isinstance(x, A):
+        reveal_type(x)  # revealed: A
+    else:
+        reveal_type(x)  # revealed: B & ~A
+
+    if True or isinstance(x, A):
+        reveal_type(x)  # revealed: A | B
+    else:
+        # TODO: should emit an `unreachable code` diagnostic
+        reveal_type(x)  # revealed: B & ~A

-if False and isinstance(x, A):
-    # TODO: should emit an `unreachable code` diagnostic
-    reveal_type(x)  # revealed: A
-else:
    reveal_type(x)  # revealed: A | B
-
-if False or isinstance(x, A):
-    reveal_type(x)  # revealed: A
-else:
-    reveal_type(x)  # revealed: B & ~A
-
-if True or isinstance(x, A):
-    reveal_type(x)  # revealed: A | B
-else:
-    # TODO: should emit an `unreachable code` diagnostic
-    reveal_type(x)  # revealed: B & ~A
-
-reveal_type(x)  # revealed: A | B
 ```

 ## The type of multiple symbols can be narrowed down
@@ -91,22 +76,17 @@ reveal_type(x)  # revealed: A | B
 class A: ...
 class B: ...

-def instance() -> A | B:
-    return A()
+def _(x: A | B, y: A | B):
+    if isinstance(x, A) and isinstance(y, B):
+        reveal_type(x)  # revealed: A
+        reveal_type(y)  # revealed: B
+    else:
+        # No narrowing: Only-one or both checks might have failed
+        reveal_type(x)  # revealed: A | B
+        reveal_type(y)  # revealed: A | B

-x = instance()
-y = instance()
-
-if isinstance(x, A) and isinstance(y, B):
-    reveal_type(x)  # revealed: A
-    reveal_type(y)  # revealed: B
-else:
-    # No narrowing: Only-one or both checks might have failed
    reveal_type(x)  # revealed: A | B
    reveal_type(y)  # revealed: A | B
-
-reveal_type(x)  # revealed: A | B
-reveal_type(y)  # revealed: A | B
 ```

 ## Narrowing in `or` conditional
@@ -116,15 +96,11 @@ class A: ...
 class B: ...
 class C: ...

-def instance() -> A | B | C:
-    return A()
-
-x = instance()
-
-if isinstance(x, A) or isinstance(x, B):
-    reveal_type(x)  # revealed:  A | B
-else:
-    reveal_type(x)  # revealed:  C & ~A & ~B
+def _(x: A | B | C):
+    if isinstance(x, A) or isinstance(x, B):
+        reveal_type(x)  # revealed:  A | B
+    else:
+        reveal_type(x)  # revealed:  C & ~A & ~B
 ```

 ## In `or`, all arms should add constraint in order to narrow
@@ -134,18 +110,11 @@ class A: ...
 class B: ...
 class C: ...

-def instance() -> A | B | C:
-    return A()
-
-def bool_instance() -> bool:
-    return True
-
-x = instance()
-
-if isinstance(x, A) or isinstance(x, B) or bool_instance():
-    reveal_type(x)  # revealed:  A | B | C
-else:
-    reveal_type(x)  # revealed:  C & ~A & ~B
+def _(flag: bool, x: A | B | C):
+    if isinstance(x, A) or isinstance(x, B) or flag:
+        reveal_type(x)  # revealed:  A | B | C
+    else:
+        reveal_type(x)  # revealed:  C & ~A & ~B
 ```

 ## in `or`, all arms should narrow the same set of symbols
@@ -155,28 +124,23 @@ class A: ...
 class B: ...
 class C: ...

-def instance() -> A | B | C:
-    return A()
+def _(x: A | B | C, y: A | B | C):
+    if isinstance(x, A) or isinstance(y, A):
+        # The predicate might be satisfied by the right side, so the type of `x` can’t be narrowed down here.
+        reveal_type(x)  # revealed:  A | B | C
+        # The same for `y`
+        reveal_type(y)  # revealed:  A | B | C
+    else:
+        reveal_type(x)  # revealed:  B & ~A | C & ~A
+        reveal_type(y)  # revealed:  B & ~A | C & ~A

-x = instance()
-y = instance()
-
-if isinstance(x, A) or isinstance(y, A):
-    # The predicate might be satisfied by the right side, so the type of `x` can’t be narrowed down here.
-    reveal_type(x)  # revealed:  A | B | C
-    # The same for `y`
-    reveal_type(y)  # revealed:  A | B | C
-else:
-    reveal_type(x)  # revealed:  B & ~A | C & ~A
-    reveal_type(y)  # revealed:  B & ~A | C & ~A
-
-if (isinstance(x, A) and isinstance(y, A)) or (isinstance(x, B) and isinstance(y, B)):
-    # Here, types of `x` and `y` can be narrowd since all `or` arms constraint them.
-    reveal_type(x)  # revealed:  A | B
-    reveal_type(y)  # revealed:  A | B
-else:
-    reveal_type(x)  # revealed:  A | B | C
-    reveal_type(y)  # revealed:  A | B | C
+    if (isinstance(x, A) and isinstance(y, A)) or (isinstance(x, B) and isinstance(y, B)):
+        # Here, types of `x` and `y` can be narrowd since all `or` arms constraint them.
+        reveal_type(x)  # revealed:  A | B
+        reveal_type(y)  # revealed:  A | B
+    else:
+        reveal_type(x)  # revealed:  A | B | C
+        reveal_type(y)  # revealed:  A | B | C
 ```

 ## mixing `and` and `not`
@@ -186,16 +150,12 @@ class A: ...
 class B: ...
 class C: ...

-def instance() -> A | B | C:
-    return A()
-
-x = instance()
-
-if isinstance(x, B) and not isinstance(x, C):
-    reveal_type(x)  # revealed:  B & ~C
-else:
-    # ~(B & ~C) -> ~B | C -> (A & ~B) | (C & ~B) | C -> (A & ~B) | C
-    reveal_type(x)  # revealed: A & ~B | C
+def _(x: A | B | C):
+    if isinstance(x, B) and not isinstance(x, C):
+        reveal_type(x)  # revealed:  B & ~C
+    else:
+        # ~(B & ~C) -> ~B | C -> (A & ~B) | (C & ~B) | C -> (A & ~B) | C
+        reveal_type(x)  # revealed: A & ~B | C
 ```

 ## mixing `or` and `not`
@@ -205,15 +165,11 @@ class A: ...
 class B: ...
 class C: ...

-def instance() -> A | B | C:
-    return A()
-
-x = instance()
-
-if isinstance(x, B) or not isinstance(x, C):
-    reveal_type(x)  # revealed: B | A & ~C
-else:
-    reveal_type(x)  # revealed: C & ~B
+def _(x: A | B | C):
+    if isinstance(x, B) or not isinstance(x, C):
+        reveal_type(x)  # revealed: B | A & ~C
+    else:
+        reveal_type(x)  # revealed: C & ~B
 ```

 ## `or` with nested `and`
@@ -223,16 +179,12 @@ class A: ...
 class B: ...
 class C: ...

-def instance() -> A | B | C:
-    return A()
-
-x = instance()
-
-if isinstance(x, A) or (isinstance(x, B) and not isinstance(x, C)):
-    reveal_type(x)  # revealed:  A | B & ~C
-else:
-    # ~(A | (B & ~C)) -> ~A & ~(B & ~C) -> ~A & (~B | C) -> (~A & C) | (~A ~ B)
-    reveal_type(x)  # revealed:  C & ~A
+def _(x: A | B | C):
+    if isinstance(x, A) or (isinstance(x, B) and not isinstance(x, C)):
+        reveal_type(x)  # revealed:  A | B & ~C
+    else:
+        # ~(A | (B & ~C)) -> ~A & ~(B & ~C) -> ~A & (~B | C) -> (~A & C) | (~A ~ B)
+        reveal_type(x)  # revealed:  C & ~A
 ```

 ## `and` with nested `or`
@@ -242,41 +194,32 @@ class A: ...
 class B: ...
 class C: ...

-def instance() -> A | B | C:
-    return A()
-
-x = instance()
-
-if isinstance(x, A) and (isinstance(x, B) or not isinstance(x, C)):
-    # A & (B | ~C) -> (A & B) | (A & ~C)
-    reveal_type(x)  # revealed:  A & B | A & ~C
-else:
-    # ~((A & B) | (A & ~C)) ->
-    # ~(A & B) & ~(A & ~C) ->
-    # (~A | ~B) & (~A | C) ->
-    # [(~A | ~B) & ~A] | [(~A | ~B) & C] ->
-    # ~A | (~A & C) | (~B & C) ->
-    # ~A | (C & ~B) ->
-    # ~A | (C & ~B)  The positive side of ~A is  A | B | C ->
-    reveal_type(x)  # revealed:  B & ~A | C & ~A | C & ~B
+def _(x: A | B | C):
+    if isinstance(x, A) and (isinstance(x, B) or not isinstance(x, C)):
+        # A & (B | ~C) -> (A & B) | (A & ~C)
+        reveal_type(x)  # revealed:  A & B | A & ~C
+    else:
+        # ~((A & B) | (A & ~C)) ->
+        # ~(A & B) & ~(A & ~C) ->
+        # (~A | ~B) & (~A | C) ->
+        # [(~A | ~B) & ~A] | [(~A | ~B) & C] ->
+        # ~A | (~A & C) | (~B & C) ->
+        # ~A | (C & ~B) ->
+        # ~A | (C & ~B)  The positive side of ~A is  A | B | C ->
+        reveal_type(x)  # revealed:  B & ~A | C & ~A | C & ~B
 ```

 ## Boolean expression internal narrowing

 ```py
-def optional_string() -> str | None:
-    return None
+def _(x: str | None, y: str | None):
+    if x is None and y is not x:
+        reveal_type(y)  # revealed: str

-x = optional_string()
-y = optional_string()
+    # Neither of the conditions alone is sufficient for narrowing y's type:
+    if x is None:
+        reveal_type(y)  # revealed: str | None

-if x is None and y is not x:
-    reveal_type(y)  # revealed: str
-
-# Neither of the conditions alone is sufficient for narrowing y's type:
-if x is None:
-    reveal_type(y)  # revealed: str | None
-
-if y is not x:
-    reveal_type(y)  # revealed: str | None
+    if y is not x:
+        reveal_type(y)  # revealed: str | None
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/narrow/conditionals/elif_else.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/narrow/conditionals/elif_else.md
@@ -3,55 +3,47 @@
 ## Positive contributions become negative in elif-else blocks

 ```py
-def int_instance() -> int:
-    return 42
-
-x = int_instance()
-
-if x == 1:
-    # cannot narrow; could be a subclass of `int`
-    reveal_type(x)  # revealed: int
-elif x == 2:
-    reveal_type(x)  # revealed: int & ~Literal[1]
-elif x != 3:
-    reveal_type(x)  # revealed: int & ~Literal[1] & ~Literal[2] & ~Literal[3]
+def _(x: int):
+    if x == 1:
+        # cannot narrow; could be a subclass of `int`
+        reveal_type(x)  # revealed: int
+    elif x == 2:
+        reveal_type(x)  # revealed: int & ~Literal[1]
+    elif x != 3:
+        reveal_type(x)  # revealed: int & ~Literal[1] & ~Literal[2] & ~Literal[3]
 ```

 ## Positive contributions become negative in elif-else blocks, with simplification

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag1: bool, flag2: bool):
+    x = 1 if flag1 else 2 if flag2 else 3

-x = 1 if bool_instance() else 2 if bool_instance() else 3
-
-if x == 1:
-    # TODO should be Literal[1]
-    reveal_type(x)  # revealed: Literal[1, 2, 3]
-elif x == 2:
-    # TODO should be Literal[2]
-    reveal_type(x)  # revealed: Literal[2, 3]
-else:
-    reveal_type(x)  # revealed: Literal[3]
+    if x == 1:
+        # TODO should be Literal[1]
+        reveal_type(x)  # revealed: Literal[1, 2, 3]
+    elif x == 2:
+        # TODO should be Literal[2]
+        reveal_type(x)  # revealed: Literal[2, 3]
+    else:
+        reveal_type(x)  # revealed: Literal[3]
 ```

 ## Multiple negative contributions using elif, with simplification

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag1: bool, flag2: bool):
+    x = 1 if flag1 else 2 if flag2 else 3

-x = 1 if bool_instance() else 2 if bool_instance() else 3
-
-if x != 1:
-    reveal_type(x)  # revealed: Literal[2, 3]
-elif x != 2:
-    # TODO should be `Literal[1]`
-    reveal_type(x)  # revealed: Literal[1, 3]
-elif x == 3:
-    # TODO should be Never
-    reveal_type(x)  # revealed: Literal[1, 2, 3]
-else:
-    # TODO should be Never
-    reveal_type(x)  # revealed: Literal[1, 2]
+    if x != 1:
+        reveal_type(x)  # revealed: Literal[2, 3]
+    elif x != 2:
+        # TODO should be `Literal[1]`
+        reveal_type(x)  # revealed: Literal[1, 3]
+    elif x == 3:
+        # TODO should be Never
+        reveal_type(x)  # revealed: Literal[1, 2, 3]
+    else:
+        # TODO should be Never
+        reveal_type(x)  # revealed: Literal[1, 2]
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/narrow/conditionals/is.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/narrow/conditionals/is.md
@@ -3,77 +3,64 @@
 ## `is None`

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = None if flag else 1

-flag = bool_instance()
-x = None if flag else 1
+    if x is None:
+        reveal_type(x)  # revealed: None
+    else:
+        reveal_type(x)  # revealed: Literal[1]

-if x is None:
-    reveal_type(x)  # revealed: None
-else:
-    reveal_type(x)  # revealed: Literal[1]
-
-reveal_type(x)  # revealed: None | Literal[1]
+    reveal_type(x)  # revealed: None | Literal[1]
 ```

 ## `is` for other types

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    class A: ...
+    x = A()
+    y = x if flag else None

-flag = bool_instance()
+    if y is x:
+        reveal_type(y)  # revealed: A
+    else:
+        reveal_type(y)  # revealed: A | None

-class A: ...
-
-x = A()
-y = x if flag else None
-
-if y is x:
-    reveal_type(y)  # revealed: A
-else:
    reveal_type(y)  # revealed: A | None
-
-reveal_type(y)  # revealed: A | None
 ```

 ## `is` in chained comparisons

 ```py
-def bool_instance() -> bool:
-    return True
+def _(x_flag: bool, y_flag: bool):
+    x = True if x_flag else False
+    y = True if y_flag else False

-x_flag, y_flag = bool_instance(), bool_instance()
-x = True if x_flag else False
-y = True if y_flag else False
-
-reveal_type(x)  # revealed: bool
-reveal_type(y)  # revealed: bool
-
-if y is x is False:  # Interpreted as `(y is x) and (x is False)`
-    reveal_type(x)  # revealed: Literal[False]
-    reveal_type(y)  # revealed: bool
-else:
-    # The negation of the clause above is (y is not x) or (x is not False)
-    # So we can't narrow the type of x or y here, because each arm of the `or` could be true
    reveal_type(x)  # revealed: bool
    reveal_type(y)  # revealed: bool
+
+    if y is x is False:  # Interpreted as `(y is x) and (x is False)`
+        reveal_type(x)  # revealed: Literal[False]
+        reveal_type(y)  # revealed: bool
+    else:
+        # The negation of the clause above is (y is not x) or (x is not False)
+        # So we can't narrow the type of x or y here, because each arm of the `or` could be true
+        reveal_type(x)  # revealed: bool
+        reveal_type(y)  # revealed: bool
 ```

 ## `is` in elif clause

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag1: bool, flag2: bool):
+    x = None if flag1 else (1 if flag2 else True)

-x = None if bool_instance() else (1 if bool_instance() else True)
-
-reveal_type(x)  # revealed: None | Literal[1] | Literal[True]
-if x is None:
-    reveal_type(x)  # revealed: None
-elif x is True:
-    reveal_type(x)  # revealed: Literal[True]
-else:
-    reveal_type(x)  # revealed: Literal[1]
+    reveal_type(x)  # revealed: None | Literal[1] | Literal[True]
+    if x is None:
+        reveal_type(x)  # revealed: None
+    elif x is True:
+        reveal_type(x)  # revealed: Literal[True]
+    else:
+        reveal_type(x)  # revealed: Literal[1]
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/narrow/conditionals/is_not.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/narrow/conditionals/is_not.md
@@ -5,34 +5,28 @@
 The type guard removes `None` from the union type:

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = None if flag else 1

-flag = bool_instance()
-x = None if flag else 1
+    if x is not None:
+        reveal_type(x)  # revealed: Literal[1]
+    else:
+        reveal_type(x)  # revealed: None

-if x is not None:
-    reveal_type(x)  # revealed: Literal[1]
-else:
-    reveal_type(x)  # revealed: None
-
-reveal_type(x)  # revealed: None | Literal[1]
+    reveal_type(x)  # revealed: None | Literal[1]
 ```

 ## `is not` for other singleton types

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = True if flag else False
+    reveal_type(x)  # revealed: bool

-flag = bool_instance()
-x = True if flag else False
-reveal_type(x)  # revealed: bool
-
-if x is not False:
-    reveal_type(x)  # revealed: Literal[True]
-else:
-    reveal_type(x)  # revealed: Literal[False]
+    if x is not False:
+        reveal_type(x)  # revealed: Literal[True]
+    else:
+        reveal_type(x)  # revealed: Literal[False]
 ```

 ## `is not` for non-singleton types
@@ -53,20 +47,17 @@ else:
 ## `is not` for other types

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    class A: ...
+    x = A()
+    y = x if flag else None

-class A: ...
+    if y is not x:
+        reveal_type(y)  # revealed: A | None
+    else:
+        reveal_type(y)  # revealed: A

-x = A()
-y = x if bool_instance() else None
-
-if y is not x:
    reveal_type(y)  # revealed: A | None
-else:
-    reveal_type(y)  # revealed: A
-
-reveal_type(y)  # revealed: A | None
 ```

 ## `is not` in chained comparisons
@@ -74,23 +65,20 @@ reveal_type(y)  # revealed: A | None
 The type guard removes `False` from the union type of the tested value only.

 ```py
-def bool_instance() -> bool:
-    return True
-
-x_flag, y_flag = bool_instance(), bool_instance()
-x = True if x_flag else False
-y = True if y_flag else False
-
-reveal_type(x)  # revealed: bool
-reveal_type(y)  # revealed: bool
-
-if y is not x is not False:  # Interpreted as `(y is not x) and (x is not False)`
-    reveal_type(x)  # revealed: Literal[True]
-    reveal_type(y)  # revealed: bool
-else:
-    # The negation of the clause above is (y is x) or (x is False)
-    # So we can't narrow the type of x or y here, because each arm of the `or` could be true
+def _(x_flag: bool, y_flag: bool):
+    x = True if x_flag else False
+    y = True if y_flag else False

    reveal_type(x)  # revealed: bool
    reveal_type(y)  # revealed: bool
+
+    if y is not x is not False:  # Interpreted as `(y is not x) and (x is not False)`
+        reveal_type(x)  # revealed: Literal[True]
+        reveal_type(y)  # revealed: bool
+    else:
+        # The negation of the clause above is (y is x) or (x is False)
+        # So we can't narrow the type of x or y here, because each arm of the `or` could be true
+
+        reveal_type(x)  # revealed: bool
+        reveal_type(y)  # revealed: bool
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/narrow/conditionals/nested.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/narrow/conditionals/nested.md
@@ -3,54 +3,45 @@
 ## Multiple negative contributions

 ```py
-def int_instance() -> int:
-    return 42
-
-x = int_instance()
-
-if x != 1:
-    if x != 2:
-        if x != 3:
-            reveal_type(x)  # revealed: int & ~Literal[1] & ~Literal[2] & ~Literal[3]
+def _(x: int):
+    if x != 1:
+        if x != 2:
+            if x != 3:
+                reveal_type(x)  # revealed: int & ~Literal[1] & ~Literal[2] & ~Literal[3]
 ```

 ## Multiple negative contributions with simplification

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag1: bool, flag2: bool):
+    x = 1 if flag1 else 2 if flag2 else 3

-flag1, flag2 = bool_instance(), bool_instance()
-x = 1 if flag1 else 2 if flag2 else 3
-
-if x != 1:
-    reveal_type(x)  # revealed: Literal[2, 3]
-    if x != 2:
-        reveal_type(x)  # revealed: Literal[3]
+    if x != 1:
+        reveal_type(x)  # revealed: Literal[2, 3]
+        if x != 2:
+            reveal_type(x)  # revealed: Literal[3]
 ```

 ## elif-else blocks

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag1: bool, flag2: bool):
+    x = 1 if flag1 else 2 if flag2 else 3

-x = 1 if bool_instance() else 2 if bool_instance() else 3
-
-if x != 1:
-    reveal_type(x)  # revealed: Literal[2, 3]
-    if x == 2:
-        # TODO should be `Literal[2]`
+    if x != 1:
        reveal_type(x)  # revealed: Literal[2, 3]
-    elif x == 3:
-        reveal_type(x)  # revealed: Literal[3]
-    else:
-        reveal_type(x)  # revealed: Never
+        if x == 2:
+            # TODO should be `Literal[2]`
+            reveal_type(x)  # revealed: Literal[2, 3]
+        elif x == 3:
+            reveal_type(x)  # revealed: Literal[3]
+        else:
+            reveal_type(x)  # revealed: Never

-elif x != 2:
-    # TODO should be Literal[1]
-    reveal_type(x)  # revealed: Literal[1, 3]
-else:
-    # TODO should be Never
-    reveal_type(x)  # revealed: Literal[1, 2, 3]
+    elif x != 2:
+        # TODO should be Literal[1]
+        reveal_type(x)  # revealed: Literal[1, 3]
+    else:
+        # TODO should be Never
+        reveal_type(x)  # revealed: Literal[1, 2, 3]
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/narrow/conditionals/not.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/narrow/conditionals/not.md
@@ -5,29 +5,25 @@ The `not` operator negates a constraint.
 ## `not is None`

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = None if flag else 1

-x = None if bool_instance() else 1
+    if not x is None:
+        reveal_type(x)  # revealed: Literal[1]
+    else:
+        reveal_type(x)  # revealed: None

-if not x is None:
-    reveal_type(x)  # revealed: Literal[1]
-else:
-    reveal_type(x)  # revealed: None
-
-reveal_type(x)  # revealed: None | Literal[1]
+    reveal_type(x)  # revealed: None | Literal[1]
 ```

 ## `not isinstance`

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = 1 if flag else "a"

-x = 1 if bool_instance() else "a"
-
-if not isinstance(x, (int)):
-    reveal_type(x)  # revealed: Literal["a"]
-else:
-    reveal_type(x)  # revealed: Literal[1]
+    if not isinstance(x, (int)):
+        reveal_type(x)  # revealed: Literal["a"]
+    else:
+        reveal_type(x)  # revealed: Literal[1]
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/narrow/conditionals/not_eq.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/narrow/conditionals/not_eq.md
@@ -3,82 +3,66 @@
 ## `x != None`

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = None if flag else 1

-flag = bool_instance()
-x = None if flag else 1
-
-if x != None:
-    reveal_type(x)  # revealed: Literal[1]
-else:
-    # TODO should be None
-    reveal_type(x)  # revealed: None | Literal[1]
+    if x != None:
+        reveal_type(x)  # revealed: Literal[1]
+    else:
+        # TODO should be None
+        reveal_type(x)  # revealed: None | Literal[1]
 ```

 ## `!=` for other singleton types

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = True if flag else False

-flag = bool_instance()
-x = True if flag else False
-
-if x != False:
-    reveal_type(x)  # revealed: Literal[True]
-else:
-    # TODO should be Literal[False]
-    reveal_type(x)  # revealed: bool
+    if x != False:
+        reveal_type(x)  # revealed: Literal[True]
+    else:
+        # TODO should be Literal[False]
+        reveal_type(x)  # revealed: bool
 ```

 ## `x != y` where `y` is of literal type

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = 1 if flag else 2

-flag = bool_instance()
-x = 1 if flag else 2
-
-if x != 1:
-    reveal_type(x)  # revealed: Literal[2]
+    if x != 1:
+        reveal_type(x)  # revealed: Literal[2]
 ```

 ## `x != y` where `y` is a single-valued type

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    class A: ...
+    class B: ...
+    C = A if flag else B

-flag = bool_instance()
-
-class A: ...
-class B: ...
-
-C = A if flag else B
-
-if C != A:
-    reveal_type(C)  # revealed: Literal[B]
-else:
-    # TODO should be Literal[A]
-    reveal_type(C)  # revealed: Literal[A, B]
+    if C != A:
+        reveal_type(C)  # revealed: Literal[B]
+    else:
+        # TODO should be Literal[A]
+        reveal_type(C)  # revealed: Literal[A, B]
 ```

 ## `x != y` where `y` has multiple single-valued options

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag1: bool, flag2: bool):
+    x = 1 if flag1 else 2
+    y = 2 if flag2 else 3

-x = 1 if bool_instance() else 2
-y = 2 if bool_instance() else 3
-
-if x != y:
-    reveal_type(x)  # revealed: Literal[1, 2]
-else:
-    # TODO should be Literal[2]
-    reveal_type(x)  # revealed: Literal[1, 2]
+    if x != y:
+        reveal_type(x)  # revealed: Literal[1, 2]
+    else:
+        # TODO should be Literal[2]
+        reveal_type(x)  # revealed: Literal[1, 2]
 ```

 ## `!=` for non-single-valued types
@@ -86,34 +70,22 @@ else:
 Only single-valued types should narrow the type:

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool, a: int, y: int):
+    x = a if flag else None

-def int_instance() -> int:
-    return 42
-
-flag = bool_instance()
-x = int_instance() if flag else None
-y = int_instance()
-
-if x != y:
-    reveal_type(x)  # revealed: int | None
+    if x != y:
+        reveal_type(x)  # revealed: int | None
 ```

 ## Mix of single-valued and non-single-valued types

 ```py
-def int_instance() -> int:
-    return 42
+def _(flag1: bool, flag2: bool, a: int):
+    x = 1 if flag1 else 2
+    y = 2 if flag2 else a

-def bool_instance() -> bool:
-    return True
-
-x = 1 if bool_instance() else 2
-y = 2 if bool_instance() else int_instance()
-
-if x != y:
-    reveal_type(x)  # revealed: Literal[1, 2]
-else:
-    reveal_type(x)  # revealed: Literal[1, 2]
+    if x != y:
+        reveal_type(x)  # revealed: Literal[1, 2]
+    else:
+        reveal_type(x)  # revealed: Literal[1, 2]
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/narrow/isinstance.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/narrow/isinstance.md
@@ -5,23 +5,19 @@ Narrowing for `isinstance(object, classinfo)` expressions.
 ## `classinfo` is a single type

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = 1 if flag else "a"

-flag = bool_instance()
-
-x = 1 if flag else "a"
-
-if isinstance(x, int):
-    reveal_type(x)  # revealed: Literal[1]
-
-if isinstance(x, str):
-    reveal_type(x)  # revealed: Literal["a"]
    if isinstance(x, int):
-        reveal_type(x)  # revealed: Never
+        reveal_type(x)  # revealed: Literal[1]

-if isinstance(x, (int, object)):
-    reveal_type(x)  # revealed: Literal[1] | Literal["a"]
+    if isinstance(x, str):
+        reveal_type(x)  # revealed: Literal["a"]
+        if isinstance(x, int):
+            reveal_type(x)  # revealed: Never
+
+    if isinstance(x, (int, object)):
+        reveal_type(x)  # revealed: Literal[1] | Literal["a"]
 ```

 ## `classinfo` is a tuple of types
@@ -30,56 +26,48 @@ Note: `isinstance(x, (int, str))` should not be confused with `isinstance(x, tup
 The former is equivalent to `isinstance(x, int | str)`:

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool, flag1: bool, flag2: bool):
+    x = 1 if flag else "a"

-flag, flag1, flag2 = bool_instance(), bool_instance(), bool_instance()
+    if isinstance(x, (int, str)):
+        reveal_type(x)  # revealed: Literal[1] | Literal["a"]
+    else:
+        reveal_type(x)  # revealed: Never

-x = 1 if flag else "a"
+    if isinstance(x, (int, bytes)):
+        reveal_type(x)  # revealed: Literal[1]

-if isinstance(x, (int, str)):
-    reveal_type(x)  # revealed: Literal[1] | Literal["a"]
-else:
-    reveal_type(x)  # revealed: Never
+    if isinstance(x, (bytes, str)):
+        reveal_type(x)  # revealed: Literal["a"]

-if isinstance(x, (int, bytes)):
-    reveal_type(x)  # revealed: Literal[1]
+    # No narrowing should occur if a larger type is also
+    # one of the possibilities:
+    if isinstance(x, (int, object)):
+        reveal_type(x)  # revealed: Literal[1] | Literal["a"]
+    else:
+        reveal_type(x)  # revealed: Never

-if isinstance(x, (bytes, str)):
-    reveal_type(x)  # revealed: Literal["a"]
+    y = 1 if flag1 else "a" if flag2 else b"b"
+    if isinstance(y, (int, str)):
+        reveal_type(y)  # revealed: Literal[1] | Literal["a"]

-# No narrowing should occur if a larger type is also
-# one of the possibilities:
-if isinstance(x, (int, object)):
-    reveal_type(x)  # revealed: Literal[1] | Literal["a"]
-else:
-    reveal_type(x)  # revealed: Never
+    if isinstance(y, (int, bytes)):
+        reveal_type(y)  # revealed: Literal[1] | Literal[b"b"]

-y = 1 if flag1 else "a" if flag2 else b"b"
-if isinstance(y, (int, str)):
-    reveal_type(y)  # revealed: Literal[1] | Literal["a"]
-
-if isinstance(y, (int, bytes)):
-    reveal_type(y)  # revealed: Literal[1] | Literal[b"b"]
-
-if isinstance(y, (str, bytes)):
-    reveal_type(y)  # revealed: Literal["a"] | Literal[b"b"]
+    if isinstance(y, (str, bytes)):
+        reveal_type(y)  # revealed: Literal["a"] | Literal[b"b"]
 ```

 ## `classinfo` is a nested tuple of types

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = 1 if flag else "a"

-flag = bool_instance()
-
-x = 1 if flag else "a"
-
-if isinstance(x, (bool, (bytes, int))):
-    reveal_type(x)  # revealed: Literal[1]
-else:
-    reveal_type(x)  # revealed: Literal["a"]
+    if isinstance(x, (bool, (bytes, int))):
+        reveal_type(x)  # revealed: Literal[1]
+    else:
+        reveal_type(x)  # revealed: Literal["a"]
 ```

 ## Class types
@@ -89,9 +77,7 @@ class A: ...
 class B: ...
 class C: ...

-def get_object() -> object: ...
-
-x = get_object()
+x = object()

 if isinstance(x, A):
    reveal_type(x)  # revealed: A
@@ -112,50 +98,40 @@ else:
 ## No narrowing for instances of `builtins.type`

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    t = type("t", (), {})

-flag = bool_instance()
+    # This isn't testing what we want it to test if we infer anything more precise here:
+    reveal_type(t)  # revealed: type

-t = type("t", (), {})
+    x = 1 if flag else "foo"

-# This isn't testing what we want it to test if we infer anything more precise here:
-reveal_type(t)  # revealed: type
-x = 1 if flag else "foo"
-
-if isinstance(x, t):
-    reveal_type(x)  # revealed: Literal[1] | Literal["foo"]
+    if isinstance(x, t):
+        reveal_type(x)  # revealed: Literal[1] | Literal["foo"]
 ```

 ## Do not use custom `isinstance` for narrowing

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    def isinstance(x, t):
+        return True
+    x = 1 if flag else "a"

-flag = bool_instance()
-
-def isinstance(x, t):
-    return True
-
-x = 1 if flag else "a"
-if isinstance(x, int):
-    reveal_type(x)  # revealed: Literal[1] | Literal["a"]
+    if isinstance(x, int):
+        reveal_type(x)  # revealed: Literal[1] | Literal["a"]
 ```

 ## Do support narrowing if `isinstance` is aliased

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    isinstance_alias = isinstance

-flag = bool_instance()
+    x = 1 if flag else "a"

-isinstance_alias = isinstance
-
-x = 1 if flag else "a"
-if isinstance_alias(x, int):
-    reveal_type(x)  # revealed: Literal[1]
+    if isinstance_alias(x, int):
+        reveal_type(x)  # revealed: Literal[1]
 ```

 ## Do support narrowing if `isinstance` is imported
@@ -163,46 +139,38 @@ if isinstance_alias(x, int):
 ```py
 from builtins import isinstance as imported_isinstance

-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = 1 if flag else "a"

-flag = bool_instance()
-x = 1 if flag else "a"
-if imported_isinstance(x, int):
-    reveal_type(x)  # revealed: Literal[1]
+    if imported_isinstance(x, int):
+        reveal_type(x)  # revealed: Literal[1]
 ```

 ## Do not narrow if second argument is not a type

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = 1 if flag else "a"

-flag = bool_instance()
-x = 1 if flag else "a"
+    # TODO: this should cause us to emit a diagnostic during
+    # type checking
+    if isinstance(x, "a"):
+        reveal_type(x)  # revealed: Literal[1] | Literal["a"]

-# TODO: this should cause us to emit a diagnostic during
-# type checking
-if isinstance(x, "a"):
-    reveal_type(x)  # revealed: Literal[1] | Literal["a"]
-
-# TODO: this should cause us to emit a diagnostic during
-# type checking
-if isinstance(x, "int"):
-    reveal_type(x)  # revealed: Literal[1] | Literal["a"]
+    # TODO: this should cause us to emit a diagnostic during
+    # type checking
+    if isinstance(x, "int"):
+        reveal_type(x)  # revealed: Literal[1] | Literal["a"]
 ```

 ## Do not narrow if there are keyword arguments

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = 1 if flag else "a"

-flag = bool_instance()
-x = 1 if flag else "a"
-
-# TODO: this should cause us to emit a diagnostic
-# (`isinstance` has no `foo` parameter)
-if isinstance(x, int, foo="bar"):
-    reveal_type(x)  # revealed: Literal[1] | Literal["a"]
+    # TODO: this should cause us to emit a diagnostic
+    # (`isinstance` has no `foo` parameter)
+    if isinstance(x, int, foo="bar"):
+        reveal_type(x)  # revealed: Literal[1] | Literal["a"]
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/narrow/issubclass.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/narrow/issubclass.md
@@ -7,45 +7,43 @@ Narrowing for `issubclass(class, classinfo)` expressions.
 ### Basic example

 ```py
-def flag() -> bool: ...
+def _(flag: bool):
+    t = int if flag else str

-t = int if flag() else str
-
-if issubclass(t, bytes):
-    reveal_type(t)  # revealed: Never
-
-if issubclass(t, object):
-    reveal_type(t)  # revealed: Literal[int, str]
-
-if issubclass(t, int):
-    reveal_type(t)  # revealed: Literal[int]
-else:
-    reveal_type(t)  # revealed: Literal[str]
-
-if issubclass(t, str):
-    reveal_type(t)  # revealed: Literal[str]
-    if issubclass(t, int):
+    if issubclass(t, bytes):
        reveal_type(t)  # revealed: Never
+
+    if issubclass(t, object):
+        reveal_type(t)  # revealed: Literal[int, str]
+
+    if issubclass(t, int):
+        reveal_type(t)  # revealed: Literal[int]
+    else:
+        reveal_type(t)  # revealed: Literal[str]
+
+    if issubclass(t, str):
+        reveal_type(t)  # revealed: Literal[str]
+        if issubclass(t, int):
+            reveal_type(t)  # revealed: Never
 ```

 ### Proper narrowing in `elif` and `else` branches

 ```py
-def flag() -> bool: ...
+def _(flag1: bool, flag2: bool):
+    t = int if flag1 else str if flag2 else bytes

-t = int if flag() else str if flag() else bytes
+    if issubclass(t, int):
+        reveal_type(t)  # revealed: Literal[int]
+    else:
+        reveal_type(t)  # revealed: Literal[str, bytes]

-if issubclass(t, int):
-    reveal_type(t)  # revealed: Literal[int]
-else:
-    reveal_type(t)  # revealed: Literal[str, bytes]
-
-if issubclass(t, int):
-    reveal_type(t)  # revealed: Literal[int]
-elif issubclass(t, str):
-    reveal_type(t)  # revealed: Literal[str]
-else:
-    reveal_type(t)  # revealed: Literal[bytes]
+    if issubclass(t, int):
+        reveal_type(t)  # revealed: Literal[int]
+    elif issubclass(t, str):
+        reveal_type(t)  # revealed: Literal[str]
+    else:
+        reveal_type(t)  # revealed: Literal[bytes]
 ```

 ### Multiple derived classes
@@ -56,29 +54,28 @@ class Derived1(Base): ...
 class Derived2(Base): ...
 class Unrelated: ...

-def flag() -> bool: ...
+def _(flag1: bool, flag2: bool, flag3: bool):
+    t1 = Derived1 if flag1 else Derived2

-t1 = Derived1 if flag() else Derived2
+    if issubclass(t1, Base):
+        reveal_type(t1)  # revealed: Literal[Derived1, Derived2]

-if issubclass(t1, Base):
-    reveal_type(t1)  # revealed: Literal[Derived1, Derived2]
+    if issubclass(t1, Derived1):
+        reveal_type(t1)  # revealed: Literal[Derived1]
+    else:
+        reveal_type(t1)  # revealed: Literal[Derived2]

-if issubclass(t1, Derived1):
-    reveal_type(t1)  # revealed: Literal[Derived1]
-else:
-    reveal_type(t1)  # revealed: Literal[Derived2]
+    t2 = Derived1 if flag2 else Base

-t2 = Derived1 if flag() else Base
+    if issubclass(t2, Base):
+        reveal_type(t2)  # revealed: Literal[Derived1, Base]

-if issubclass(t2, Base):
-    reveal_type(t2)  # revealed: Literal[Derived1, Base]
+    t3 = Derived1 if flag3 else Unrelated

-t3 = Derived1 if flag() else Unrelated
-
-if issubclass(t3, Base):
-    reveal_type(t3)  # revealed: Literal[Derived1]
-else:
-    reveal_type(t3)  # revealed: Literal[Unrelated]
+    if issubclass(t3, Base):
+        reveal_type(t3)  # revealed: Literal[Derived1]
+    else:
+        reveal_type(t3)  # revealed: Literal[Unrelated]
 ```

 ### Narrowing for non-literals
@@ -87,16 +84,13 @@ else:
 class A: ...
 class B: ...

-def get_class() -> type[object]: ...
-
-t = get_class()
-
-if issubclass(t, A):
-    reveal_type(t)  # revealed: type[A]
-    if issubclass(t, B):
-        reveal_type(t)  # revealed: type[A] & type[B]
-else:
-    reveal_type(t)  # revealed: type[object] & ~type[A]
+def _(t: type[object]):
+    if issubclass(t, A):
+        reveal_type(t)  # revealed: type[A]
+        if issubclass(t, B):
+            reveal_type(t)  # revealed: type[A] & type[B]
+    else:
+        reveal_type(t)  # revealed: type[object] & ~type[A]
 ```

 ### Handling of `None`
@@ -107,16 +101,15 @@ else:
 # error: [possibly-unbound-import] "Member `NoneType` of module `types` is possibly unbound"
 from types import NoneType

-def flag() -> bool: ...
+def _(flag: bool):
+    t = int if flag else NoneType

-t = int if flag() else NoneType
+    if issubclass(t, NoneType):
+        reveal_type(t)  # revealed: Literal[NoneType]

-if issubclass(t, NoneType):
-    reveal_type(t)  # revealed: Literal[NoneType]
-
-if issubclass(t, type(None)):
-    # TODO: this should be just `Literal[NoneType]`
-    reveal_type(t)  # revealed: Literal[int, NoneType]
+    if issubclass(t, type(None)):
+        # TODO: this should be just `Literal[NoneType]`
+        reveal_type(t)  # revealed: Literal[int, NoneType]
 ```

 ## `classinfo` contains multiple types
@@ -126,14 +119,13 @@ if issubclass(t, type(None)):
 ```py
 class Unrelated: ...

-def flag() -> bool: ...
+def _(flag1: bool, flag2: bool):
+    t = int if flag1 else str if flag2 else bytes

-t = int if flag() else str if flag() else bytes
-
-if issubclass(t, (int, (Unrelated, (bytes,)))):
-    reveal_type(t)  # revealed: Literal[int, bytes]
-else:
-    reveal_type(t)  # revealed: Literal[str]
+    if issubclass(t, (int, (Unrelated, (bytes,)))):
+        reveal_type(t)  # revealed: Literal[int, bytes]
+    else:
+        reveal_type(t)  # revealed: Literal[str]
 ```

 ## Special cases
@@ -148,9 +140,7 @@ to `issubclass`:
 ```py
 class A: ...

-def get_object() -> object: ...
-
-t = get_object()
+t = object()

 # TODO: we should emit a diagnostic here
 if issubclass(t, A):
--- a/crates/red_knot_python_semantic/resources/mdtest/narrow/match.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/narrow/match.md
@@ -3,19 +3,16 @@
 ## Single `match` pattern

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    x = None if flag else 1

-flag = bool_instance()
+    reveal_type(x)  # revealed: None | Literal[1]

-x = None if flag else 1
-reveal_type(x)  # revealed: None | Literal[1]
+    y = 0

-y = 0
+    match x:
+        case None:
+            y = x

-match x:
-    case None:
-        y = x
-
-reveal_type(y)  # revealed: Literal[0] | None
+    reveal_type(y)  # revealed: Literal[0] | None
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/narrow/post_if_statement.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/narrow/post_if_statement.md
@@ -3,62 +3,49 @@
 ## After if-else statements, narrowing has no effect if the variable is not mutated in any branch

 ```py
-def optional_int() -> int | None: ...
+def _(x: int | None):
+    if x is None:
+        pass
+    else:
+        pass

-x = optional_int()
-
-if x is None:
-    pass
-else:
-    pass
-
-reveal_type(x)  # revealed: int | None
+    reveal_type(x)  # revealed: int | None
 ```

 ## Narrowing can have a persistent effect if the variable is mutated in one branch

 ```py
-def optional_int() -> int | None: ...
+def _(x: int | None):
+    if x is None:
+        x = 10
+    else:
+        pass

-x = optional_int()
-
-if x is None:
-    x = 10
-else:
-    pass
-
-reveal_type(x)  # revealed: int
+    reveal_type(x)  # revealed: int
 ```

 ## An if statement without an explicit `else` branch is equivalent to one with a no-op `else` branch

 ```py
-def optional_int() -> int | None: ...
+def _(x: int | None, y: int | None):
+    if x is None:
+        x = 0

-x = optional_int()
-y = optional_int()
+    if y is None:
+        pass

-if x is None:
-    x = 0
-
-if y is None:
-    pass
-
-reveal_type(x)  # revealed: int
-reveal_type(y)  # revealed: int | None
+    reveal_type(x)  # revealed: int
+    reveal_type(y)  # revealed: int | None
 ```

 ## An if-elif without an explicit else branch is equivalent to one with an empty else branch

 ```py
-def optional_int() -> int | None: ...
+def _(x: int | None):
+    if x is None:
+        x = 0
+    elif x > 50:
+        x = 50

-x = optional_int()
-
-if x is None:
-    x = 0
-elif x > 50:
-    x = 50
-
-reveal_type(x)  # revealed: int
+    reveal_type(x)  # revealed: int
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/narrow/type.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/narrow/type.md
@@ -6,18 +6,14 @@
 class A: ...
 class B: ...

-def get_a_or_b() -> A | B:
-    return A()
-
-x = get_a_or_b()
-
-if type(x) is A:
-    reveal_type(x)  # revealed: A
-else:
-    # It would be wrong to infer `B` here. The type
-    # of `x` could be a subclass of `A`, so we need
-    # to infer the full union type:
-    reveal_type(x)  # revealed: A | B
+def _(x: A | B):
+    if type(x) is A:
+        reveal_type(x)  # revealed: A
+    else:
+        # It would be wrong to infer `B` here. The type
+        # of `x` could be a subclass of `A`, so we need
+        # to infer the full union type:
+        reveal_type(x)  # revealed: A | B
 ```

 ## `type(x) is not C`
@@ -26,16 +22,12 @@ else:
 class A: ...
 class B: ...

-def get_a_or_b() -> A | B:
-    return A()
-
-x = get_a_or_b()
-
-if type(x) is not A:
-    # Same reasoning as above: no narrowing should occur here.
-    reveal_type(x)  # revealed: A | B
-else:
-    reveal_type(x)  # revealed: A
+def _(x: A | B):
+    if type(x) is not A:
+        # Same reasoning as above: no narrowing should occur here.
+        reveal_type(x)  # revealed: A | B
+    else:
+        reveal_type(x)  # revealed: A
 ```

 ## `type(x) == C`, `type(x) != C`
@@ -54,16 +46,12 @@ class IsEqualToEverything(type):
 class A(metaclass=IsEqualToEverything): ...
 class B(metaclass=IsEqualToEverything): ...

-def get_a_or_b() -> A | B:
-    return B()
+def _(x: A | B):
+    if type(x) == A:
+        reveal_type(x)  # revealed: A | B

-x = get_a_or_b()
-
-if type(x) == A:
-    reveal_type(x)  # revealed: A | B
-
-if type(x) != A:
-    reveal_type(x)  # revealed: A | B
+    if type(x) != A:
+        reveal_type(x)  # revealed: A | B
 ```

 ## No narrowing for custom `type` callable
@@ -75,15 +63,11 @@ class B: ...
 def type(x):
    return int

-def get_a_or_b() -> A | B:
-    return A()
-
-x = get_a_or_b()
-
-if type(x) is A:
-    reveal_type(x)  # revealed: A | B
-else:
-    reveal_type(x)  # revealed: A | B
+def _(x: A | B):
+    if type(x) is A:
+        reveal_type(x)  # revealed: A | B
+    else:
+        reveal_type(x)  # revealed: A | B
 ```

 ## No narrowing for multiple arguments
@@ -91,15 +75,11 @@ else:
 No narrowing should occur if `type` is used to dynamically create a class:

 ```py
-def get_str_or_int() -> str | int:
-    return "test"
-
-x = get_str_or_int()
-
-if type(x, (), {}) is str:
-    reveal_type(x)  # revealed: str | int
-else:
-    reveal_type(x)  # revealed: str | int
+def _(x: str | int):
+    if type(x, (), {}) is str:
+        reveal_type(x)  # revealed: str | int
+    else:
+        reveal_type(x)  # revealed: str | int
 ```

 ## No narrowing for keyword arguments
@@ -107,14 +87,10 @@ else:
 `type` can't be used with a keyword argument:

 ```py
-def get_str_or_int() -> str | int:
-    return "test"
-
-x = get_str_or_int()
-
-# TODO: we could issue a diagnostic here
-if type(object=x) is str:
-    reveal_type(x)  # revealed: str | int
+def _(x: str | int):
+    # TODO: we could issue a diagnostic here
+    if type(object=x) is str:
+        reveal_type(x)  # revealed: str | int
 ```

 ## Narrowing if `type` is aliased
@@ -125,13 +101,9 @@ class B: ...

 alias_for_type = type

-def get_a_or_b() -> A | B:
-    return A()
-
-x = get_a_or_b()
-
-if alias_for_type(x) is A:
-    reveal_type(x)  # revealed: A
+def _(x: A | B):
+    if alias_for_type(x) is A:
+        reveal_type(x)  # revealed: A
 ```

 ## Limitations
@@ -140,13 +112,9 @@ if alias_for_type(x) is A:
 class Base: ...
 class Derived(Base): ...

-def get_base() -> Base:
-    return Base()
-
-x = get_base()
-
-if type(x) is Base:
-    # Ideally, this could be narrower, but there is now way to
-    # express a constraint like `Base & ~ProperSubtypeOf[Base]`.
-    reveal_type(x)  # revealed: Base
+def _(x: Base):
+    if type(x) is Base:
+        # Ideally, this could be narrower, but there is now way to
+        # express a constraint like `Base & ~ProperSubtypeOf[Base]`.
+        reveal_type(x)  # revealed: Base
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/narrow/while.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/narrow/while.md
@@ -0,0 +1,58 @@
+# Narrowing in `while` loops
+
+We only make sure that narrowing works for `while` loops in general, we do not exhaustively test all
+narrowing forms here, as they are covered in other tests.
+
+Note how type narrowing works subtly different from `if` ... `else`, because the negated constraint
+is retained after the loop.
+
+## Basic `while` loop
+
+```py
+def next_item() -> int | None: ...
+
+x = next_item()
+
+while x is not None:
+    reveal_type(x)  # revealed: int
+    x = next_item()
+
+reveal_type(x)  # revealed: None
+```
+
+## `while` loop with `else`
+
+```py
+def next_item() -> int | None: ...
+
+x = next_item()
+
+while x is not None:
+    reveal_type(x)  # revealed: int
+    x = next_item()
+else:
+    reveal_type(x)  # revealed: None
+
+reveal_type(x)  # revealed: None
+```
+
+## Nested `while` loops
+
+```py
+from typing import Literal
+
+def next_item() -> Literal[1, 2, 3]: ...
+
+x = next_item()
+
+while x != 1:
+    reveal_type(x)  # revealed: Literal[2, 3]
+
+    while x != 2:
+        # TODO: this should be Literal[1, 3]; Literal[3] is only correct
+        # in the first loop iteration
+        reveal_type(x)  # revealed: Literal[3]
+        x = next_item()
+
+    x = next_item()
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/pep695_type_aliases.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/pep695_type_aliases.md
@@ -1,4 +1,11 @@
-# Type aliases
+# PEP 695 type aliases
+
+PEP 695 type aliases are only available in Python 3.12 and later:
+
+```toml
+[environment]
+python-version = "3.12"
+```

 ## Basic

--- a/crates/red_knot_python_semantic/resources/mdtest/scopes/moduletype_attrs.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/scopes/moduletype_attrs.md
@@ -59,7 +59,7 @@ reveal_type(typing.__init__)  # revealed: Literal[__init__]
 # These come from `builtins.object`, not `types.ModuleType`:
 reveal_type(typing.__eq__)  # revealed: Literal[__eq__]

-reveal_type(typing.__class__)  # revealed: Literal[type]
+reveal_type(typing.__class__)  # revealed: Literal[ModuleType]

 # TODO: needs support for attribute access on instances, properties and generics;
 # should be `dict[str, Any]`
--- a/crates/red_knot_python_semantic/resources/mdtest/scopes/nonlocal.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/scopes/nonlocal.md
@@ -0,0 +1,45 @@
+# Nonlocal references
+
+## One level up
+
+```py
+def f():
+    x = 1
+    def g():
+        reveal_type(x)  # revealed: Literal[1]
+```
+
+## Two levels up
+
+```py
+def f():
+    x = 1
+    def g():
+        def h():
+            reveal_type(x)  # revealed: Literal[1]
+```
+
+## Skips class scope
+
+```py
+def f():
+    x = 1
+
+    class C:
+        x = 2
+        def g():
+            reveal_type(x)  # revealed: Literal[1]
+```
+
+## Skips annotation-only assignment
+
+```py
+def f():
+    x = 1
+    def g():
+        # it's pretty weird to have an annotated assignment in a function where the
+        # name is otherwise not defined; maybe should be an error?
+        x: int
+        def h():
+            reveal_type(x)  # revealed: Literal[1]
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/scopes/unbound.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/scopes/unbound.md
@@ -0,0 +1,57 @@
+# Unbound
+
+## Unbound class variable
+
+Name lookups within a class scope fall back to globals, but lookups of class attributes don't.
+
+```py
+def coinflip() -> bool:
+    return True
+
+flag = coinflip()
+x = 1
+
+class C:
+    y = x
+    if flag:
+        x = 2
+
+# error: [possibly-unbound-attribute] "Attribute `x` on type `Literal[C]` is possibly unbound"
+reveal_type(C.x)  # revealed: Literal[2]
+reveal_type(C.y)  # revealed: Literal[1]
+```
+
+## Possibly unbound in class and global scope
+
+```py
+def coinflip() -> bool:
+    return True
+
+if coinflip():
+    x = "abc"
+
+class C:
+    if coinflip():
+        x = 1
+
+    # error: [possibly-unresolved-reference]
+    y = x
+
+reveal_type(C.y)  # revealed: Literal[1] | Literal["abc"]
+```
+
+## Unbound function local
+
+An unbound function local that has definitions in the scope does not fall back to globals.
+
+```py
+x = 1
+
+def f():
+    # error: [unresolved-reference]
+    # revealed: Unknown
+    reveal_type(x)
+    x = 2
+    # revealed: Literal[2]
+    reveal_type(x)
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/shadowing/variable_declaration.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/shadowing/variable_declaration.md
@@ -3,14 +3,11 @@
 ## Shadow after incompatible declarations is OK

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    if flag:
+        x: str
+    else:
+        x: int

-flag = bool_instance()
-
-if flag:
-    x: str
-else:
-    x: int
-x: bytes = b"foo"
+    x: bytes = b"foo"
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/stubs/class.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/stubs/class.md
@@ -1,4 +1,4 @@
-# Class defenitions in stubs
+# Class definitions in stubs

 ## Cyclical class definition

--- a/crates/red_knot_python_semantic/resources/mdtest/subscript/bytes.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/subscript/bytes.md
@@ -22,12 +22,10 @@ reveal_type(x)  # revealed: Unknown
 y = b[-6]  # error: [index-out-of-bounds] "Index -6 is out of bounds for bytes literal `Literal[b"\x00abc\xff"]` with length 5"
 reveal_type(y)  # revealed: Unknown

-def int_instance() -> int:
-    return 42
-
-a = b"abcde"[int_instance()]
-# TODO: Support overloads... Should be `bytes`
-reveal_type(a)  # revealed: @Todo(return type)
+def _(n: int):
+    a = b"abcde"[n]
+    # TODO: Support overloads... Should be `bytes`
+    reveal_type(a)  # revealed: @Todo(return type)
 ```

 ## Slices
@@ -43,15 +41,13 @@ b[:4:0]  # error: [zero-stepsize-in-slice]
 b[0::0]  # error: [zero-stepsize-in-slice]
 b[::0]  # error: [zero-stepsize-in-slice]

-def int_instance() -> int: ...
+def _(m: int, n: int):
+    byte_slice1 = b[m:n]
+    # TODO: Support overloads... Should be `bytes`
+    reveal_type(byte_slice1)  # revealed: @Todo(return type)

-byte_slice1 = b[int_instance() : int_instance()]
-# TODO: Support overloads... Should be `bytes`
-reveal_type(byte_slice1)  # revealed: @Todo(return type)
-
-def bytes_instance() -> bytes: ...
-
-byte_slice2 = bytes_instance()[0:5]
-# TODO: Support overloads... Should be `bytes`
-reveal_type(byte_slice2)  # revealed: @Todo(return type)
+def _(s: bytes) -> bytes:
+    byte_slice2 = s[0:5]
+    # TODO: Support overloads... Should be `bytes`
+    reveal_type(byte_slice2)  # revealed: @Todo(return type)
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/subscript/class.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/subscript/class.md
@@ -21,77 +21,66 @@ reveal_type(Identity[0])  # revealed: str
 ## Class getitem union

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    class UnionClassGetItem:
+        if flag:
+            def __class_getitem__(cls, item: int) -> str:
+                return item
+        else:
+            def __class_getitem__(cls, item: int) -> int:
+                return item

-class UnionClassGetItem:
-    if bool_instance():
-
-        def __class_getitem__(cls, item: int) -> str:
-            return item
-    else:
-
-        def __class_getitem__(cls, item: int) -> int:
-            return item
-
-reveal_type(UnionClassGetItem[0])  # revealed: str | int
+    reveal_type(UnionClassGetItem[0])  # revealed: str | int
 ```

 ## Class getitem with class union

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    class A:
+        def __class_getitem__(cls, item: int) -> str:
+            return item

-class A:
-    def __class_getitem__(cls, item: int) -> str:
-        return item
+    class B:
+        def __class_getitem__(cls, item: int) -> int:
+            return item

-class B:
-    def __class_getitem__(cls, item: int) -> int:
-        return item
+    x = A if flag else B

-x = A if bool_instance() else B
-
-reveal_type(x)  # revealed: Literal[A, B]
-reveal_type(x[0])  # revealed: str | int
+    reveal_type(x)  # revealed: Literal[A, B]
+    reveal_type(x[0])  # revealed: str | int
 ```

 ## Class getitem with unbound method union

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    if flag:
+        class Spam:
+            def __class_getitem__(self, x: int) -> str:
+                return "foo"

-if bool_instance():
-    class Spam:
-        def __class_getitem__(self, x: int) -> str:
-            return "foo"
-
-else:
-    class Spam: ...
-
-# error: [call-possibly-unbound-method] "Method `__class_getitem__` of type `Literal[Spam, Spam]` is possibly unbound"
-# revealed: str
-reveal_type(Spam[42])
+    else:
+        class Spam: ...
+    # error: [call-possibly-unbound-method] "Method `__class_getitem__` of type `Literal[Spam, Spam]` is possibly unbound"
+    # revealed: str
+    reveal_type(Spam[42])
 ```

 ## TODO: Class getitem non-class union

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    if flag:
+        class Eggs:
+            def __class_getitem__(self, x: int) -> str:
+                return "foo"

-if bool_instance():
-    class Eggs:
-        def __class_getitem__(self, x: int) -> str:
-            return "foo"
+    else:
+        Eggs = 1

-else:
-    Eggs = 1
+    a = Eggs[42]  # error: "Cannot subscript object of type `Literal[Eggs] | Literal[1]` with no `__getitem__` method"

-a = Eggs[42]  # error: "Cannot subscript object of type `Literal[Eggs] | Literal[1]` with no `__getitem__` method"
-
-# TODO: should _probably_ emit `str | Unknown`
-reveal_type(a)  # revealed: Unknown
+    # TODO: should _probably_ emit `str | Unknown`
+    reveal_type(a)  # revealed: Unknown
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/subscript/instance.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/subscript/instance.md
@@ -30,18 +30,14 @@ reveal_type(Identity()[0])  # revealed: int
 ## Getitem union

 ```py
-def bool_instance() -> bool:
-    return True
+def _(flag: bool):
+    class Identity:
+        if flag:
+            def __getitem__(self, index: int) -> int:
+                return index
+        else:
+            def __getitem__(self, index: int) -> str:
+                return str(index)

-class Identity:
-    if bool_instance():
-
-        def __getitem__(self, index: int) -> int:
-            return index
-    else:
-
-        def __getitem__(self, index: int) -> str:
-            return str(index)
-
-reveal_type(Identity()[0])  # revealed: int | str
+    reveal_type(Identity()[0])  # revealed: int | str
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/subscript/string.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/subscript/string.md
@@ -19,11 +19,10 @@ reveal_type(a)  # revealed: Unknown
 b = s[-8]  # error: [index-out-of-bounds] "Index -8 is out of bounds for string `Literal["abcde"]` with length 5"
 reveal_type(b)  # revealed: Unknown

-def int_instance() -> int: ...
-
-a = "abcde"[int_instance()]
-# TODO: Support overloads... Should be `str`
-reveal_type(a)  # revealed: @Todo(return type)
+def _(n: int):
+    a = "abcde"[n]
+    # TODO: Support overloads... Should be `str`
+    reveal_type(a)  # revealed: @Todo(return type)
 ```

 ## Slices
@@ -74,17 +73,14 @@ s[:4:0]  # error: [zero-stepsize-in-slice]
 s[0::0]  # error: [zero-stepsize-in-slice]
 s[::0]  # error: [zero-stepsize-in-slice]

-def int_instance() -> int: ...
+def _(m: int, n: int, s2: str):
+    substring1 = s[m:n]
+    # TODO: Support overloads... Should be `LiteralString`
+    reveal_type(substring1)  # revealed: @Todo(return type)

-substring1 = s[int_instance() : int_instance()]
-# TODO: Support overloads... Should be `LiteralString`
-reveal_type(substring1)  # revealed: @Todo(return type)
-
-def str_instance() -> str: ...
-
-substring2 = str_instance()[0:5]
-# TODO: Support overloads... Should be `str`
-reveal_type(substring2)  # revealed: @Todo(return type)
+    substring2 = s2[0:5]
+    # TODO: Support overloads... Should be `str`
+    reveal_type(substring2)  # revealed: @Todo(return type)
 ```

 ## Unsupported slice types
--- a/crates/red_knot_python_semantic/resources/mdtest/subscript/tuple.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/subscript/tuple.md
@@ -67,9 +67,60 @@ t[:4:0]  # error: [zero-stepsize-in-slice]
 t[0::0]  # error: [zero-stepsize-in-slice]
 t[::0]  # error: [zero-stepsize-in-slice]

-def int_instance() -> int: ...
-
-tuple_slice = t[int_instance() : int_instance()]
-# TODO: Support overloads... Should be `tuple[Literal[1, 'a', b"b"] | None, ...]`
-reveal_type(tuple_slice)  # revealed: @Todo(return type)
+def _(m: int, n: int):
+    tuple_slice = t[m:n]
+    # TODO: Support overloads... Should be `tuple[Literal[1, 'a', b"b"] | None, ...]`
+    reveal_type(tuple_slice)  # revealed: @Todo(return type)
+```
+
+## Inheritance
+
+```toml
+[environment]
+python-version = "3.9"
+```
+
+```py
+# TODO:
+#  * `tuple.__class_getitem__` is always bound on 3.9 (`sys.version_info`)
+#  * `tuple[int, str]` is a valid base (generics)
+# error: [call-possibly-unbound-method] "Method `__class_getitem__` of type `Literal[tuple]` is possibly unbound"
+# error: [invalid-base] "Invalid class base with type `GenericAlias` (all bases must be a class, `Any`, `Unknown` or `Todo`)"
+class A(tuple[int, str]): ...
+
+# Runtime value: `(A, tuple, object)`
+# TODO: Generics
+reveal_type(A.__mro__)  # revealed: tuple[Literal[A], Unknown, Literal[object]]
+```
+
+## `typing.Tuple`
+
+### Correspondence with `tuple`
+
+`typing.Tuple` can be used interchangeably with `tuple`:
+
+```py
+from typing import Tuple
+
+class A: ...
+
+def _(c: Tuple, d: Tuple[int, A], e: Tuple[Any, ...]):
+    reveal_type(c)  # revealed: tuple
+    reveal_type(d)  # revealed: tuple[int, A]
+    reveal_type(e)  # revealed: @Todo(full tuple[...] support)
+```
+
+### Inheritance
+
+Inheriting from `Tuple` results in a MRO with `builtins.tuple` and `typing.Generic`. `Tuple` itself
+is not a class.
+
+```py
+from typing import Tuple
+
+class C(Tuple): ...
+
+# Runtime value: `(C, tuple, typing.Generic, object)`
+# TODO: Add `Generic` to the MRO
+reveal_type(C.__mro__)  # revealed: tuple[Literal[C], Literal[tuple], Unknown, Literal[object]]
 ```
--- a/crates/red_knot_python_semantic/resources/mdtest/sys_version_info.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/sys_version_info.md
@@ -1,5 +1,10 @@
 # `sys.version_info`

+```toml
+[environment]
+python-version = "3.9"
+```
+
 ## The type of `sys.version_info`

 The type of `sys.version_info` is `sys._version_info`, at least according to typeshed's stubs (which
--- a/crates/red_knot_python_semantic/resources/mdtest/type_of/any.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/type_of/any.md
@@ -0,0 +1,72 @@
+# `type[Any]`
+
+## Simple
+
+```py
+def f(x: type[Any]):
+    reveal_type(x)  # revealed: type[Any]
+    # TODO: could be `<object.__repr__ type> & Any`
+    reveal_type(x.__repr__)  # revealed: Any
+
+class A: ...
+
+x: type[Any] = object
+x: type[Any] = type
+x: type[Any] = A
+x: type[Any] = A()  # error: [invalid-assignment]
+```
+
+## Bare type
+
+The interpretation of bare `type` is not clear: existing wording in the spec does not match the
+behavior of mypy or pyright. For now we interpret it as simply "an instance of `builtins.type`",
+which is equivalent to `type[object]`. This is similar to the current behavior of mypy, and pyright
+in strict mode.
+
+```py
+def f(x: type):
+    reveal_type(x)  # revealed: type
+    reveal_type(x.__repr__)  # revealed: @Todo(instance attributes)
+
+class A: ...
+
+x: type = object
+x: type = type
+x: type = A
+x: type = A()  # error: [invalid-assignment]
+```
+
+## type[object] != type[Any]
+
+```py
+def f(x: type[object]):
+    reveal_type(x)  # revealed: type[object]
+    # TODO: bound method types
+    reveal_type(x.__repr__)  # revealed: Literal[__repr__]
+
+class A: ...
+
+x: type[object] = object
+x: type[object] = type
+x: type[object] = A
+x: type[object] = A()  # error: [invalid-assignment]
+```
+
+## The type of `Any` is `type[Any]`
+
+`Any` represents an unknown set of possible runtime values. If `x` is of type `Any`, the type of
+`x.__class__` is also unknown and remains dynamic, *except* that we know it must be a class object
+of some kind. As such, the type of `x.__class__` is `type[Any]` rather than `Any`:
+
+```py
+from typing import Any
+from does_not_exist import SomethingUnknown  # error: [unresolved-import]
+
+reveal_type(SomethingUnknown)  # revealed: Unknown
+
+def test(x: Any, y: SomethingUnknown):
+    reveal_type(x.__class__)  # revealed: type[Any]
+    reveal_type(x.__class__.__class__.__class__.__class__)  # revealed: type[Any]
+    reveal_type(y.__class__)  # revealed: type[Unknown]
+    reveal_type(y.__class__.__class__.__class__.__class__)  # revealed: type[Unknown]
+```
--- a/crates/red_knot_python_semantic/resources/mdtest/type_of/basic.md
+++ b/crates/red_knot_python_semantic/resources/mdtest/type_of/basic.md
@@ -0,0 +1,146 @@
+# type special form
+
+## Class literal
+
+```py
+class A: ...
+
+def _(c: type[A]):
+    reveal_type(c)  # revealed: type[A]
+```
+
+## Nested class literal
+
+```py
+class A:
+    class B: ...
+
+def f(c: type[A.B]):
+    reveal_type(c)  # revealed: type[B]
+```
+
+## Deeply nested class literal
+
+```py
+class A:
+    class B:
+        class C: ...
+
+def f(c: type[A.B.C]):
+    reveal_type(c)  # revealed: type[C]
+```
+
+## Class literal from another module
+
+```py
+from a import A
+
+def f(c: type[A]):
+    reveal_type(c)  # revealed: type[A]
+```
+
+```py path=a.py
+class A: ...
+```
+
+## Qualified class literal from another module
+
+```py
+import a
+
+def f(c: type[a.B]):
+    reveal_type(c)  # revealed: type[B]
+```
+
+```py path=a.py
+class B: ...
+```
+
+## Deeply qualified class literal from another module
+
+```py path=a/test.py
+import a.b
+
+# TODO: no diagnostic
+# error: [unresolved-attribute]
+def f(c: type[a.b.C]):
+    reveal_type(c)  # revealed: @Todo(unsupported type[X] special form)
+```
+
+```py path=a/__init__.py
+```
+
+```py path=a/b.py
+class C: ...
+```
+
+## New-style union of classes
+
+```py
+class BasicUser: ...
+class ProUser: ...
+
+class A:
+    class B:
+        class C: ...
+
+def _(u: type[BasicUser | ProUser | A.B.C]):
+    # revealed: type[BasicUser] | type[ProUser] | type[C]
+    reveal_type(u)
+```
+
+## Old-style union of classes
+
+```py
+from typing import Union
+
+class BasicUser: ...
+class ProUser: ...
+
+class A:
+    class B:
+        class C: ...
+
+def f(a: type[Union[BasicUser, ProUser, A.B.C]], b: type[Union[str]], c: type[Union[BasicUser, Union[ProUser, A.B.C]]]):
+    reveal_type(a)  # revealed: type[BasicUser] | type[ProUser] | type[C]
+    reveal_type(b)  # revealed: type[str]
+    reveal_type(c)  # revealed: type[BasicUser] | type[ProUser] | type[C]
+```
+
+## New-style and old-style unions in combination
+
+```py
+from typing import Union
+
+class BasicUser: ...
+class ProUser: ...
+
+class A:
+    class B:
+        class C: ...
+
+def f(a: type[BasicUser | Union[ProUser, A.B.C]], b: type[Union[BasicUser | Union[ProUser, A.B.C | str]]]):
+    reveal_type(a)  # revealed: type[BasicUser] | type[ProUser] | type[C]
+    reveal_type(b)  # revealed: type[BasicUser] | type[ProUser] | type[C] | type[str]
+```
+
+## Illegal parameters
+
+```py
+class A: ...
+class B: ...
+
+# error: [invalid-type-form]
+_: type[A, B]
+```
+
+## As a base class
+
+```py
+# TODO: this is a false positive
+# error: [invalid-base] "Invalid class base with type `GenericAlias` (all bases must be a class, `Any`, `Unknown` or `Todo`)"
+class Foo(type[int]): ...
+
+# TODO: should be `tuple[Literal[Foo], Literal[type], Literal[object]]
+reveal_type(Foo.__mro__)  # revealed: tuple[Literal[Foo], Unknown, Literal[object]]
+```
--- a/Show More
+++ b/Show More